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 /registry | |
| 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 'registry')
| -rw-r--r-- | registry/workben/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/registry/workben/makefile.mk b/registry/workben/makefile.mk index c0e07eab3f28..32b8b0e92dd5 100644 --- a/registry/workben/makefile.mk +++ b/registry/workben/makefile.mk @@ -54,8 +54,8 @@ APP2OBJS= $(OBJ)$/test.obj APP2RPATH=NONE .IF "$(GUI)"=="UNX" && "$(OS)"!="MACOSX" -.IF "$(OS)"=="LINUX" -APP2LINKFLAGS=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../lib'\' +.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" +APP2LINKFLAGS=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../lib'\' .ENDIF .IF "$(OS)"=="SOLARIS" |