diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:10:34 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:10:34 +0000 |
| commit | 9fc71afb7cd31b79cfe73f170241f6d00f05fa26 (patch) | |
| tree | 678733eb5fcbe1b93dc9b70194bea1140a85207e /solenv | |
| parent | 0e689647326860ca5f78ff1b90f6e954f1b85471 (diff) | |
INTEGRATION: CWS sb83 (1.29.52); FILE MERGED
2008/02/01 11:02:16 sb 1.29.52.4: #i84200# added SHLnRPATH=OXT for libraries within extensions (that only link against URE libs)
2008/01/09 10:51:34 sb 1.29.52.3: RESYNC: (1.29-1.30); FILE MERGED
2007/12/19 10:36:17 sb 1.29.52.2: #i84200# typo
2007/12/03 13:42:36 sb 1.29.52.1: #i84200# Added LINKFLAGSRUNPATH_BRAND.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/unxlngppc4.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/solenv/inc/unxlngppc4.mk b/solenv/inc/unxlngppc4.mk index bacd9f4efde8..746358fb92c6 100644 --- a/solenv/inc/unxlngppc4.mk +++ b/solenv/inc/unxlngppc4.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxlngppc4.mk,v $ # -# $Revision: 1.30 $ +# $Revision: 1.31 $ # -# last change: $Author: kz $ $Date: 2007-12-12 13:20:25 $ +# last change: $Author: vg $ $Date: 2008-03-18 13:10:34 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -137,6 +137,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= LINKFLAGS= $(LINKFLAGSDEFS) # linker flags for linking applications |