diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-03 16:39:26 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-03 16:39:26 +0000 |
| commit | 30ddbc0bcc0ff00badcc191a2121b4121a8ee54f (patch) | |
| tree | 0610e0cbe5ade64240a362320f935ca4dfcae416 /configmgr | |
| parent | b9f97a25a975f1aa9061592f5e104ebe8de847c5 (diff) | |
INTEGRATION: CWS solarisgcc02 (1.23.58); FILE MERGED
2005/02/12 14:19:22 pjanik 1.23.58.1: #i42548#: Do not use -instances=static for gcc on Solaris.
Patch contributed by: Taniguchi Yasuaki (JCA).
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/xml/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configmgr/source/xml/makefile.mk b/configmgr/source/xml/makefile.mk index a10c43aa1de2..f31f6fd14f3d 100644 --- a/configmgr/source/xml/makefile.mk +++ b/configmgr/source/xml/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.23 $ +# $Revision: 1.24 $ # -# last change: $Author: rt $ $Date: 2004-05-05 10:47:52 $ +# last change: $Author: kz $ $Date: 2005-03-03 17:39:26 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -71,7 +71,7 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(OS)"=="SOLARIS" +.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC" CFLAGSCXX+=-instances=static .ENDIF |