diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:39:51 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:39:51 +0000 |
| commit | bdd8e47ad73c4e8058af46d2c523f211c474a8eb (patch) | |
| tree | 6473c0ca15cd00118ed2adadc7ef0ff66f770f16 /solenv/inc/tg_shl.mk | |
| parent | a756a880612b67f69e01fbc59e53284d3a320be3 (diff) | |
INTEGRATION: CWS sb71 (1.109.32); FILE MERGED
2007/10/02 09:47:30 sb 1.109.32.4: RESYNC: (1.113-1.114); FILE MERGED
2007/07/18 11:59:48 sb 1.109.32.3: RESYNC: (1.110-1.113); FILE MERGED
2007/06/15 08:12:35 sb 1.109.32.2: RESYNC: (1.109-1.110); FILE MERGED
2007/06/14 15:09:32 sb 1.109.32.1: #i75466# Replaced LINKFLAGSRUNPATH with more flexible APP|SHLnRPATH.
Diffstat (limited to 'solenv/inc/tg_shl.mk')
| -rw-r--r-- | solenv/inc/tg_shl.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 433059009657..8c8eabd679fb 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_shl.mk,v $ # -# $Revision: 1.114 $ +# $Revision: 1.115 $ # -# last change: $Author: kz $ $Date: 2007-09-06 13:40:25 $ +# last change: $Author: vg $ $Date: 2007-10-15 12:39:51 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -61,6 +61,10 @@ SHL$(TNR)STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL)) SHL$(TNR)LINKFLAGS+=$(LINKFLAGS) .ENDIF # "$(SHL$(TNR)CODETYPE)"=="C" +SHL$(TNR)RPATH*=OOO +LINKFLAGSRUNPATH_$(SHL$(TNR)RPATH)*=/ERROR:/Bad_SHL$(TNR)RPATH_value +SHL$(TNR)LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL$(TNR)RPATH)) + .IF "$(SHL$(TNR)USE_EXPORTS)"=="" SHL$(TNR)DEF*=$(MISC)$/$(SHL$(TNR)TARGET).def .ENDIF # "$(SHL$(TNR)USE_EXPORTS)"=="" |