* merged 32bit-wchar_t branches of buildtools and haiku back into
the respective trunk git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31443 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -394,8 +394,6 @@ HAIKU_LIBRARY_BEGIN_GLUE_CODE =
|
||||
<src!system!glue>init_term_dyn.o
|
||||
;
|
||||
HAIKU_LIBRARY_END_GLUE_CODE =
|
||||
# TODO: For the time being always link against libsupc++.a.
|
||||
$(HAIKU_STATIC_LIBSUPC++)
|
||||
crtend.o
|
||||
<src!system!glue!arch!$(HAIKU_ARCH)>crtn.o
|
||||
;
|
||||
@@ -434,6 +432,7 @@ HAIKU_BUILD_DESCRIPTION ?= "Unknown Build" ;
|
||||
HAIKU_LIBRARY_NAME_MAP_$(i) = lib$(i).so ;
|
||||
}
|
||||
HAIKU_LIBRARY_NAME_MAP_libstdc++ = $(HAIKU_LIBSTDC++) ;
|
||||
HAIKU_LIBRARY_NAME_MAP_libsupc++ = $(HAIKU_LIBSUPC++) ;
|
||||
HAIKU_LIBRARY_NAME_MAP_input_server = <nogrist>input_server ;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user