From f7d29d339b00d2432ee695809c92698ce7886ab0 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 26 Feb 2007 02:47:12 +0000 Subject: [PATCH] Don't include the grist in libraries' sonames. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20233 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/KernelRules | 2 +- build/jam/MainBuildRules | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/jam/KernelRules b/build/jam/KernelRules index a7ba9ea487..a86a0f135c 100644 --- a/build/jam/KernelRules +++ b/build/jam/KernelRules @@ -105,7 +105,7 @@ rule KernelAddon # compile and link 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) ; Main $(target) : $(sources) ; LinkAgainst $(target) : $(libs) $(kernel) ; diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules index 00a4410909..a31a26ea45 100644 --- a/build/jam/MainBuildRules +++ b/build/jam/MainBuildRules @@ -116,7 +116,7 @@ rule Addon Main $(1) : $(3) ; - local linkFlags = -Xlinker -soname=\"$(1)\" ; + local linkFlags = -Xlinker -soname=\"$(1:G=)\" ; if $(isExecutable) != true { linkFlags = -nostart $(linkFlags) ; } @@ -282,7 +282,7 @@ rule SharedLibraryFromObjects MainFromObjects $(_lib) : $(2) ; LINKFLAGS on $(_lib) = [ on $(_lib) return $(LINKFLAGS) ] - -nostart -Xlinker -soname=\"$(_lib)\" ; + -nostart -Xlinker -soname=\"$(_lib:G=)\" ; LinkAgainst $(_lib) : $(3) ; AddSharedObjectGlueCode $(_lib) : false ; @@ -464,7 +464,7 @@ rule BuildPlatformSharedLibrary BuildPlatformMain $(target) : $(sources) : $(libs) ; LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ] - -shared -Xlinker -soname=\"$(target)\" ; + -shared -Xlinker -soname=\"$(target:G=)\" ; } rule BuildPlatformMergeObject