strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

extension libs should have no RPATH

Browse source
This commit is contained in:
David Tardon 2012-04-19 15:10:47 +02:00
parent 61d78aca81
commit fba1422900
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
solenv/gbuild/platform/solaris.mk
View file

@ -196,7 +196,7 @@ gb_LinkTarget__RPATHS := \
UREBIN:\dORIGIN/../lib:\dORIGIN \ UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \ OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \ SDKBIN:\dORIGIN/../../ure-link/lib \
OXT:\dORIGIN/../lib:\dORIGIN \ OXT: \
NONE:\dORIGIN/../lib:\dORIGIN \ NONE:\dORIGIN/../lib:\dORIGIN \
gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
@ -301,12 +301,15 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
define gb_Library_get_rpath define gb_Library__get_rpath
'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' \ $(if $(1),$(strip '-Wl,-rpath,$(1)' '-L$(gb_Library_OUTDIRLOCATION)'))
'-L$(gb_Library_OUTDIRLOCATION)'
#JAD#'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)' #JAD#'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
endef endef
define gb_Library_get_rpath
$(call gb_Library__get_rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1))))
endef
define gb_Library_Library_platform define gb_Library_Library_platform
$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1)) $(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1))

9
solenv/gbuild/platform/unxgcc.mk
View file

@ -204,7 +204,7 @@ gb_LinkTarget__RPATHS := \
UREBIN:\dORIGIN/../lib:\dORIGIN \ UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \ OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \ SDKBIN:\dORIGIN/../../ure-link/lib \
OXT:\dORIGIN/../lib:\dORIGIN \ OXT: \
NONE:\dORIGIN/../lib:\dORIGIN \ NONE:\dORIGIN/../lib:\dORIGIN \
gb_LinkTarget_CFLAGS := $(gb_CFLAGS) gb_LinkTarget_CFLAGS := $(gb_CFLAGS)
@ -312,9 +312,12 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
define gb_Library__get_rpath
$(if $(1),$(strip '-Wl,-rpath,$(1)' '-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'))
endef
define gb_Library_get_rpath define gb_Library_get_rpath
'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' \ $(call gb_Library__get_rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1))))
'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
endef endef
define gb_Library_Library_platform define gb_Library_Library_platform