diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:39:38 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:39:38 +0000 |
| commit | a756a880612b67f69e01fbc59e53284d3a320be3 (patch) | |
| tree | d569cdc91e3d38c480130482231708314e16f891 /solenv/inc/tg_app.mk | |
| parent | e1c192d9fd8f77a1504e06e61735e68caa442edc (diff) | |
INTEGRATION: CWS sb71 (1.63.20); FILE MERGED
2007/07/18 11:59:17 sb 1.63.20.3: RESYNC: (1.64-1.67); FILE MERGED
2007/06/15 08:12:15 sb 1.63.20.2: RESYNC: (1.63-1.64); FILE MERGED
2007/06/14 15:09:32 sb 1.63.20.1: #i75466# Replaced LINKFLAGSRUNPATH with more flexible APP|SHLnRPATH.
Diffstat (limited to 'solenv/inc/tg_app.mk')
| -rw-r--r-- | solenv/inc/tg_app.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk index dede0e11dd00..e67c7409a415 100644 --- a/solenv/inc/tg_app.mk +++ b/solenv/inc/tg_app.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_app.mk,v $ # -# $Revision: 1.67 $ +# $Revision: 1.68 $ # -# last change: $Author: rt $ $Date: 2007-07-02 09:23:33 $ +# last change: $Author: vg $ $Date: 2007-10-15 12:39:38 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -53,6 +53,10 @@ APP$(TNR)STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB)) APP$(TNR)LINKFLAGS+=$(LINKFLAGS) .ENDIF # "$(APP$(TNR)CODETYPE)"=="C" +APP$(TNR)RPATH*=OOO +LINKFLAGSRUNPATH_$(APP$(TNR)RPATH)*=/ERROR:/Bad_APP$(TNR)RPATH_value +APP$(TNR)LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP$(TNR)RPATH)) + .IF "$(APP$(TNR)STACK)" != "" .IF "$(LINKFLAGSTACK)" != "" APP$(TNR)STACKN=$(LINKFLAGSTACK)$(APP$(TNR)STACK) |