diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-08-29 11:27:23 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-29 12:02:26 +0200 |
commit | 34ca8dd9adb62c1154f979887a38483d73da978b (patch) | |
tree | 86907a50ccfefcd088c6c04e56f08542dfaf0caa /odk | |
parent | .gitignore config.Build.log (diff) | |
download | core-34ca8dd9adb62c1154f979887a38483d73da978b.tar.gz core-34ca8dd9adb62c1154f979887a38483d73da978b.zip |
fdo#54015: At least FreeBSD ld requires -z origin when RPATH contains $ORIGIN
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>:
* bulk replacement of "-Wl,-z,origin,-rpath,..." with
"-Wl,-z,origin -Wl,rpath,..."
* additional hunk for directory/c-sdk/config/FreeBSD.mk in
moz/seamonkey-source-1.1.14.patch did not apply and has been dropped
Change-Id: Ie60c696f041108e819ce8f799cff6f58e63a5ad7
Diffstat (limited to 'odk')
-rw-r--r-- | odk/settings/settings.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index f2eeb144925a..489701028f57 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -345,7 +345,7 @@ CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_G CC_OUTPUT_SWITCH=-o -LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' +LIBRARY_LINK_FLAGS=-shared '-Wl,-z,origin -Wl,-rpath,$$ORIGIN' ifeq "$(PROCTYPE)" "ppc" LIBRARY_LINK_FLAGS+=-fPIC @@ -580,7 +580,7 @@ CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK CC_OUTPUT_SWITCH=-o -LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' +LIBRARY_LINK_FLAGS=-shared '-Wl,-z,origin -Wl,-rpath,$$ORIGIN' COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined |