From 9d00a03d7bbac9ed5d5e6c474cc51275b0f75843 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 3 Jun 2008 16:34:02 +0000 Subject: [PATCH] Moved --no-undefined flag addition to AddSharedObjectGlueCode where it is added in case of target platform haiku only. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25790 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/MainBuildRules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules index f43ccf7d22..08b1e7374b 100644 --- a/build/jam/MainBuildRules +++ b/build/jam/MainBuildRules @@ -30,7 +30,8 @@ rule AddSharedObjectGlueCode NEEDLIBS on $(1) = [ on $(1) return $(NEEDLIBS) ] $(stdLibs) ; Depends $(1) : $(stdLibs) $(beginGlue) $(endGlue) ; - LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] -nostdlib ; + LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] -nostdlib + -Xlinker --no-undefined ; } } @@ -52,7 +53,7 @@ rule Executable Main $(1) : $(2) ; LinkAgainst $(1) : $(3) ; LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] - -Xlinker --no-undefined -Xlinker -soname=_APP_ ; + -Xlinker -soname=_APP_ ; # we link with -nostdlib and add the required libs manually, when building # for Haiku @@ -112,8 +113,7 @@ rule Addon target : sources : libraries : isExecutable Main $(target) : $(sources) ; - local linkFlags = -Xlinker --no-undefined - -Xlinker -soname=\"$(target:G=)\" ; + local linkFlags = -Xlinker -soname=\"$(target:G=)\" ; if $(isExecutable) != true { linkFlags = -nostart $(linkFlags) ; } @@ -398,7 +398,7 @@ rule SharedLibraryFromObjects MainFromObjects $(_lib) : $(2) ; LINKFLAGS on $(_lib) = [ on $(_lib) return $(LINKFLAGS) ] - -nostart -Xlinker --no-undefined -Xlinker -soname=\"$(_lib:G=)\" ; + -nostart -Xlinker -soname=\"$(_lib:G=)\" ; LinkAgainst $(_lib) : $(3) ; AddSharedObjectGlueCode $(_lib) : false ;