diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-03 15:45:38 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-03 15:45:38 +0000 |
| commit | ffa81dbc0353093c20142da5221cd1b47780181d (patch) | |
| tree | 60241d1a47a145f88b45ed7b94b7fe876e1f9c48 /solenv | |
| parent | 3bc95259549ee27ce52b74773c6fecf176b6e831 (diff) | |
INTEGRATION: CWS s390xport01 (1.2.202); FILE MERGED
2008/03/26 12:56:09 cmc 1.2.202.1: #i87464# add support for s390x and merge sb's LINK changes into the other minor ports
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/unxlngmips.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk index 043eac7c4a7b..87c175714779 100644 --- a/solenv/inc/unxlngmips.mk +++ b/solenv/inc/unxlngmips.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxlngmips.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: hr $ $Date: 2007-11-02 15:20:37 $ +# last change: $Author: kz $ $Date: 2008-04-03 16:45:38 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -171,8 +171,13 @@ LINKC*=$(CC) # default linker flags LINKFLAGSDEFS*=-Wl,-z,defs -LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' -LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) +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=-Wl,-z,combreloc $(LINKFLAGSDEFS) # linker flags for linking applications LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec |