INTEGRATION: CWS sb83 (1.5.52); FILE MERGED

2008/02/01 11:02:16 sb 1.5.52.4: #i84200# added SHLnRPATH=OXT for libraries within extensions (that only link against URE libs)
2008/01/09 10:51:25 sb 1.5.52.3: RESYNC: (1.5-1.6); FILE MERGED
2007/12/19 10:36:17 sb 1.5.52.2: #i84200# typo
2007/12/03 13:42:35 sb 1.5.52.1: #i84200# Added LINKFLAGSRUNPATH_BRAND.
This commit is contained in:
Vladimir Glazounov 2008-03-18 12:09:54 +00:00
parent 15b845ba5e
commit 96d9e8861d

View file

@ -4,9 +4,9 @@
#
# $RCSfile: unxfbsd.mk,v $
#
# $Revision: 1.6 $
# $Revision: 1.7 $
#
# last change: $Author: kz $ $Date: 2007-12-12 13:19:03 $
# last change: $Author: vg $ $Date: 2008-03-18 13:09:54 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -149,6 +149,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=-Wl,-z,combreloc $(LINKFLAGSDEFS)
# linker flags for linking applications