diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:09:40 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:09:40 +0000 |
| commit | 15b845ba5e5f77e2d629f2f38082e15cc8df9197 (patch) | |
| tree | 1a1acf44e4c6d29351375f5875a78e9426c3a119 | |
| parent | bfacd5cd774249862ca0ee7be1cadcd3ea8ad06d (diff) | |
INTEGRATION: CWS sb83 (1.13.52); FILE MERGED
2008/02/01 11:02:16 sb 1.13.52.4: #i84200# added SHLnRPATH=OXT for libraries within extensions (that only link against URE libs)
2008/01/09 10:51:22 sb 1.13.52.3: RESYNC: (1.13-1.14); FILE MERGED
2007/12/19 10:36:16 sb 1.13.52.2: #i84200# typo
2007/12/03 13:42:35 sb 1.13.52.1: #i84200# Added LINKFLAGSRUNPATH_BRAND.
| -rw-r--r-- | solenv/inc/unxbsdi2.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/solenv/inc/unxbsdi2.mk b/solenv/inc/unxbsdi2.mk index e355589425fb..34793e5c283a 100644 --- a/solenv/inc/unxbsdi2.mk +++ b/solenv/inc/unxbsdi2.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxbsdi2.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # -# last change: $Author: kz $ $Date: 2007-12-12 13:18:36 $ +# last change: $Author: vg $ $Date: 2008-03-18 13:09:40 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -127,6 +127,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 |