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 /berkeleydb | |
| 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 'berkeleydb')
| -rw-r--r-- | berkeleydb/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 6ee001dd7c64..eff14b8515e9 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -89,14 +89,14 @@ CXXFLAGS+=-g .ENDIF .IF "$(GUI)"=="UNX" -.IF "$(OS)$(COM)"=="LINUXGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' +.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" +LDFLAGS:=-Wl,-z,origin -Wl,-rpath,'$$$$ORIGIN' .EXPORT: LDFLAGS #The current dir when linking is unxlngi6.pro/misc/build/db-4.2.52.NC/out # the map file is in unxlngi6.pro/misc/build/db-4.2.52.NC LDFLAGSVERSION:= -Wl,--version-script=../db_4_7_gcc4.map .EXPORT: LDFLAGSVERSION -.ENDIF # "$(OS)$(COM)"=="LINUXGCC" +.ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" .IF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=$(ARCH_FLAGS) -R\''$$$$ORIGIN'\' .EXPORT: LDFLAGS |