diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:41:27 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:41:27 +0000 |
| commit | 3b20a7208e4d7c231b4ccc836cae6926da06370a (patch) | |
| tree | cb2fef7f6b65eaa1a5213b92a1d412a2a9a935d8 /solenv/inc/unxlngs.mk | |
| parent | 3ccab34f38741b96867540691ab613963d9b74a0 (diff) | |
INTEGRATION: CWS sb71 (1.20.6); FILE MERGED
2007/08/23 17:50:05 sb 1.20.6.2: RESYNC: (1.20-1.21); FILE MERGED
2007/06/14 15:09:32 sb 1.20.6.1: #i75466# Replaced LINKFLAGSRUNPATH with more flexible APP|SHLnRPATH.
Diffstat (limited to 'solenv/inc/unxlngs.mk')
| -rw-r--r-- | solenv/inc/unxlngs.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk index 48c1e717cda3..74b25a504a2a 100644 --- a/solenv/inc/unxlngs.mk +++ b/solenv/inc/unxlngs.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxlngs.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.22 $ # -# last change: $Author: hr $ $Date: 2007-07-31 13:07:01 $ +# last change: $Author: vg $ $Date: 2007-10-15 12:41:27 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -139,8 +139,11 @@ LINK*=$(CXX) # default linker flags LINKFLAGSDEFS*=-Wl,-z,defs -LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' -LINKFLAGS=-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'\' +LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) # linker flags for linking applications LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec |