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

Moved --no-undefined flag addition to AddSharedObjectGlueCode where it

Browse Source 
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
This commit is contained in:
Ingo Weinhold
2008-06-03 16:34:02 +00:00
parent 15cdb34646
commit 9d00a03d7b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/MainBuildRules
+5 -5
View File
@@ -30,7 +30,8 @@ rule AddSharedObjectGlueCode
NEEDLIBS on $(1) = [ on $(1) return $(NEEDLIBS) ] $(stdLibs) ; NEEDLIBS on $(1) = [ on $(1) return $(NEEDLIBS) ] $(stdLibs) ;
Depends $(1) : $(stdLibs) $(beginGlue) $(endGlue) ; 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) ; Main $(1) : $(2) ;
LinkAgainst $(1) : $(3) ; LinkAgainst $(1) : $(3) ;
LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] 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 # we link with -nostdlib and add the required libs manually, when building
# for Haiku # for Haiku
@@ -112,8 +113,7 @@ rule Addon target : sources : libraries : isExecutable
Main $(target) : $(sources) ; Main $(target) : $(sources) ;
local linkFlags = -Xlinker --no-undefined local linkFlags = -Xlinker -soname=\"$(target:G=)\" ;
-Xlinker -soname=\"$(target:G=)\" ;
if $(isExecutable) != true { if $(isExecutable) != true {
linkFlags = -nostart $(linkFlags) ; linkFlags = -nostart $(linkFlags) ;
} }
@@ -398,7 +398,7 @@ rule SharedLibraryFromObjects
MainFromObjects $(_lib) : $(2) ; MainFromObjects $(_lib) : $(2) ;
LINKFLAGS on $(_lib) = [ on $(_lib) return $(LINKFLAGS) ] LINKFLAGS on $(_lib) = [ on $(_lib) return $(LINKFLAGS) ]
-nostart -Xlinker --no-undefined -Xlinker -soname=\"$(_lib:G=)\" ; -nostart -Xlinker -soname=\"$(_lib:G=)\" ;
LinkAgainst $(_lib) : $(3) ; LinkAgainst $(_lib) : $(3) ;
AddSharedObjectGlueCode $(_lib) : false ; AddSharedObjectGlueCode $(_lib) : false ;