diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-19 15:10:47 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-19 15:21:46 +0200 |
| commit | fba1422900c6d1763e2792b4a798d8c840d38fb1 (patch) | |
| tree | fec7e663ea45a96587d901ab38e91c61597811e6 /solenv/gbuild | |
| parent | 61d78aca81f08ac3a0f9eb65799d04d56fbad312 (diff) | |
extension libs should have no RPATH
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 11 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 9 |
2 files changed, 13 insertions, 7 deletions
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 28de7bd16f4a..1152c687a3e9 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -196,7 +196,7 @@ gb_LinkTarget__RPATHS := \ UREBIN:\dORIGIN/../lib:\dORIGIN \ OOO:\dORIGIN:\dORIGIN/../ure-link/lib \ SDKBIN:\dORIGIN/../../ure-link/lib \ - OXT:\dORIGIN/../lib:\dORIGIN \ + OXT: \ NONE:\dORIGIN/../lib:\dORIGIN \ 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_EXTENSIONLIBS),$(lib):OXT) \ -define gb_Library_get_rpath -'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' \ -'-L$(gb_Library_OUTDIRLOCATION)' +define gb_Library__get_rpath +$(if $(1),$(strip '-Wl,-rpath,$(1)' '-L$(gb_Library_OUTDIRLOCATION)')) #JAD#'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)' 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 $(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1)) diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 37243ad18c61..58bc7eb79ca1 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -204,7 +204,7 @@ gb_LinkTarget__RPATHS := \ UREBIN:\dORIGIN/../lib:\dORIGIN \ OOO:\dORIGIN:\dORIGIN/../ure-link/lib \ SDKBIN:\dORIGIN/../../ure-link/lib \ - OXT:\dORIGIN/../lib:\dORIGIN \ + OXT: \ NONE:\dORIGIN/../lib:\dORIGIN \ gb_LinkTarget_CFLAGS := $(gb_CFLAGS) @@ -312,9 +312,12 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ $(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 -'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' \ -'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)' +$(call gb_Library__get_rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))) endef define gb_Library_Library_platform |