extension libs should have no RPATH
This commit is contained in:
parent
61d78aca81
commit
fba1422900
2 changed files with 13 additions and 7 deletions
|
@ -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))
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue