Don't include the grist in libraries' sonames.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20233 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -105,7 +105,7 @@ rule KernelAddon
|
|||||||
|
|
||||||
# compile and link
|
# compile and link
|
||||||
SetupKernel $(sources) : $(TARGET_KERNEL_PIC_FLAGS) : false ;
|
SetupKernel $(sources) : $(TARGET_KERNEL_PIC_FLAGS) : false ;
|
||||||
local linkFlags = -nostdlib -Xlinker -soname=\"$(target)\" ;
|
local linkFlags = -nostdlib -Xlinker -soname=\"$(target:G=)\" ;
|
||||||
LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ] $(linkFlags) ;
|
LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ] $(linkFlags) ;
|
||||||
Main $(target) : $(sources) ;
|
Main $(target) : $(sources) ;
|
||||||
LinkAgainst $(target) : $(libs) $(kernel) ;
|
LinkAgainst $(target) : $(libs) $(kernel) ;
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ rule Addon
|
|||||||
|
|
||||||
Main $(1) : $(3) ;
|
Main $(1) : $(3) ;
|
||||||
|
|
||||||
local linkFlags = -Xlinker -soname=\"$(1)\" ;
|
local linkFlags = -Xlinker -soname=\"$(1:G=)\" ;
|
||||||
if $(isExecutable) != true {
|
if $(isExecutable) != true {
|
||||||
linkFlags = -nostart $(linkFlags) ;
|
linkFlags = -nostart $(linkFlags) ;
|
||||||
}
|
}
|
||||||
@@ -282,7 +282,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 -soname=\"$(_lib)\" ;
|
-nostart -Xlinker -soname=\"$(_lib:G=)\" ;
|
||||||
LinkAgainst $(_lib) : $(3) ;
|
LinkAgainst $(_lib) : $(3) ;
|
||||||
|
|
||||||
AddSharedObjectGlueCode $(_lib) : false ;
|
AddSharedObjectGlueCode $(_lib) : false ;
|
||||||
@@ -464,7 +464,7 @@ rule BuildPlatformSharedLibrary
|
|||||||
|
|
||||||
BuildPlatformMain $(target) : $(sources) : $(libs) ;
|
BuildPlatformMain $(target) : $(sources) : $(libs) ;
|
||||||
LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ]
|
LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ]
|
||||||
-shared -Xlinker -soname=\"$(target)\" ;
|
-shared -Xlinker -soname=\"$(target:G=)\" ;
|
||||||
}
|
}
|
||||||
|
|
||||||
rule BuildPlatformMergeObject
|
rule BuildPlatformMergeObject
|
||||||
|
|||||||
Reference in New Issue
Block a user