diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:11:28 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:11:28 +0000 |
| commit | 02b80d9d2c56668b9ba4d4adabe621e24c3b4848 (patch) | |
| tree | 03b54b296ef53e953728485726607e84fb86a760 /solenv/inc/unxsoli4.mk | |
| parent | c8ec0f9e4c78a8039553ffeba148a41634297e69 (diff) | |
INTEGRATION: CWS sb83 (1.39.50); FILE MERGED
2008/02/01 13:28:11 sb 1.39.50.4: RESYNC: (1.40-1.41); FILE MERGED
2008/02/01 11:02:16 sb 1.39.50.3: #i84200# added SHLnRPATH=OXT for libraries within extensions (that only link against URE libs)
2008/01/09 10:51:47 sb 1.39.50.2: RESYNC: (1.39-1.40); FILE MERGED
2007/12/03 13:42:36 sb 1.39.50.1: #i84200# Added LINKFLAGSRUNPATH_BRAND.
Diffstat (limited to 'solenv/inc/unxsoli4.mk')
| -rw-r--r-- | solenv/inc/unxsoli4.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk index 4cfdee5ab87d..d0f52d2aadf3 100644 --- a/solenv/inc/unxsoli4.mk +++ b/solenv/inc/unxsoli4.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxsoli4.mk,v $ # -# $Revision: 1.41 $ +# $Revision: 1.42 $ # -# last change: $Author: ihi $ $Date: 2008-01-14 14:31:24 $ +# last change: $Author: vg $ $Date: 2008-03-18 13:11:28 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -134,6 +134,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 |