diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:11:42 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:11:42 +0000 |
| commit | a0f160be42fcbfce34a2ce3852fe5250aab81a49 (patch) | |
| tree | b93e9c48a96c39147b1a1976724812d5790e287a /solenv/inc/unxsols4.mk | |
| parent | 02b80d9d2c56668b9ba4d4adabe621e24c3b4848 (diff) | |
INTEGRATION: CWS sb83 (1.45.50); FILE MERGED
2008/02/01 13:28:14 sb 1.45.50.4: RESYNC: (1.46-1.47); FILE MERGED
2008/02/01 11:02:16 sb 1.45.50.3: #i84200# added SHLnRPATH=OXT for libraries within extensions (that only link against URE libs)
2008/01/09 10:51:50 sb 1.45.50.2: RESYNC: (1.45-1.46); FILE MERGED
2007/12/03 13:42:36 sb 1.45.50.1: #i84200# Added LINKFLAGSRUNPATH_BRAND.
Diffstat (limited to 'solenv/inc/unxsols4.mk')
| -rw-r--r-- | solenv/inc/unxsols4.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk index 8e5a536ce366..0fc74e6918f0 100644 --- a/solenv/inc/unxsols4.mk +++ b/solenv/inc/unxsols4.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxsols4.mk,v $ # -# $Revision: 1.47 $ +# $Revision: 1.48 $ # -# last change: $Author: ihi $ $Date: 2008-01-14 14:31:37 $ +# last change: $Author: vg $ $Date: 2008-03-18 13:11:42 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -140,6 +140,8 @@ LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\' LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\' #TODO: drop $ORIGIN once no URE executable is also shipped in OOo LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' +LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' +LINKFLAGSRUNPATH_OXT= LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd LINKCFLAGS=-w -mt -z combreloc -norunpath |