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 /libxslt | |
| parent | cc9c380b157d03ca10d66c66f4500ddaf5e42f7e (diff) | |
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 'libxslt')
| -rw-r--r-- | libxslt/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 7c86a4cce6e1..670ebb952219 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -103,8 +103,8 @@ BUILD_DIR=$(CONFIGURE_DIR) .ELSE .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -.ENDIF # "$(OS)$(COM)"=="LINUXGCC" +LDFLAGS:=-Wl,-z,origin -Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec +.ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" .IF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" |