diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:10:49 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:10:49 +0000 |
| commit | 810cbf7e0f976974df286662916bce024aa6a0a3 (patch) | |
| tree | 690a9a7d3996412ddf2b3bc1a27382e783a9b95d /solenv/inc/unxlngs.mk | |
| parent | 9fc71afb7cd31b79cfe73f170241f6d00f05fa26 (diff) | |
INTEGRATION: CWS sb83 (1.22.52); FILE MERGED
2008/02/01 11:02:16 sb 1.22.52.4: #i84200# added SHLnRPATH=OXT for libraries within extensions (that only link against URE libs)
2008/01/09 10:51:38 sb 1.22.52.3: RESYNC: (1.22-1.23); FILE MERGED
2007/12/19 10:36:17 sb 1.22.52.2: #i84200# typo
2007/12/03 13:42:36 sb 1.22.52.1: #i84200# Added LINKFLAGSRUNPATH_BRAND.
Diffstat (limited to 'solenv/inc/unxlngs.mk')
| -rw-r--r-- | solenv/inc/unxlngs.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk index 22d22571a563..6409d770caaa 100644 --- a/solenv/inc/unxlngs.mk +++ b/solenv/inc/unxlngs.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxlngs.mk,v $ # -# $Revision: 1.23 $ +# $Revision: 1.24 $ # -# last change: $Author: kz $ $Date: 2007-12-12 13:20:53 $ +# last change: $Author: vg $ $Date: 2008-03-18 13:10:49 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -143,6 +143,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=-z combreloc $(LINKFLAGSDEFS) # linker flags for linking applications |