i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KernelLd rule: opt-out linking against libsupc++

Browse Source 
Introduced HAIKU_NO_LIBSUPC++ variable on target to prevent linking
against libsupc++.
This commit is contained in:
Ingo Weinhold
2011-07-17 16:54:14 +02:00
parent 898396ef61
commit abc3c57ba6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/KernelRules
+7 -2
View File
@@ -44,8 +44,13 @@ rule KernelLd
LINKFLAGS on $(1) = $(4) ; LINKFLAGS on $(1) = $(4) ;
if $(3) { LINKFLAGS on $(1) += --script=$(3) ; } if $(3) { LINKFLAGS on $(1) += --script=$(3) ; }
# Remove any preset LINKLIBS, but link against libgcc.a # Remove any preset LINKLIBS, but link against libgcc.a. Linking against
LINKLIBS on $(1) = $(TARGET_STATIC_LIBSUPC++) $(TARGET_GCC_LIBGCC) ; # libsupc++ is opt-out.
local libs ;
if ! [ on $(1) return HAIKU_NO_LIBSUPC++ ] {
libs += $(TARGET_STATIC_LIBSUPC++) ;
}
LINKLIBS on $(1) = $(libs) $(TARGET_GCC_LIBGCC) ;
# TODO: Do we really want to invoke SetupKernel here? The objects should # TODO: Do we really want to invoke SetupKernel here? The objects should
# have been compiled with KernelObjects anyway, so we're doing that twice. # have been compiled with KernelObjects anyway, so we're doing that twice.