diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:10:21 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:10:21 +0000 |
| commit | 0e689647326860ca5f78ff1b90f6e954f1b85471 (patch) | |
| tree | dcec529191f54e7faa87f1ea4d6e9d80589933f9 /solenv/inc/unxlngi6.mk | |
| parent | 04b7445b78730ebb28f58f5bf1bb158a0e88c6e7 (diff) | |
INTEGRATION: CWS sb83 (1.41.50); FILE MERGED
2008/02/01 13:28:05 sb 1.41.50.5: RESYNC: (1.42-1.43); FILE MERGED
2008/02/01 11:02:16 sb 1.41.50.4: #i84200# added SHLnRPATH=OXT for libraries within extensions (that only link against URE libs)
2008/01/09 10:51:31 sb 1.41.50.3: RESYNC: (1.41-1.42); FILE MERGED
2007/12/19 10:36:17 sb 1.41.50.2: #i84200# typo
2007/12/03 13:42:36 sb 1.41.50.1: #i84200# Added LINKFLAGSRUNPATH_BRAND.
Diffstat (limited to 'solenv/inc/unxlngi6.mk')
| -rw-r--r-- | solenv/inc/unxlngi6.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/solenv/inc/unxlngi6.mk b/solenv/inc/unxlngi6.mk index 22f4eabfbabc..8f9f9dc87e00 100644 --- a/solenv/inc/unxlngi6.mk +++ b/solenv/inc/unxlngi6.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxlngi6.mk,v $ # -# $Revision: 1.43 $ +# $Revision: 1.44 $ # -# last change: $Author: ihi $ $Date: 2008-01-14 14:31:01 $ +# last change: $Author: vg $ $Date: 2008-03-18 13:10:21 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -155,6 +155,8 @@ LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\' LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' #TODO: drop $ORIGIN once no URE executable is also shipped in OOo LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' +LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' +LINKFLAGSRUNPATH_OXT= # flag -Wl,-z,noexecstack sets the NX bit on the stack LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) |