summaryrefslogtreecommitdiff
path: root/store/util
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-11-02 12:04:39 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-11-02 12:04:39 +0000
commit17edd75d262dfce265e7e26808ff346d73446476 (patch)
tree8a4c8efb57a40409af5e4366405229ad6c88abc0 /store/util
parent6705afb40e20c4c44d0d254fd53b0b1feef3cdd3 (diff)
INTEGRATION: CWS os2port02 (1.20.6); FILE MERGED
2007/09/30 12:03:06 ydario 1.20.6.1: Issue number: i82034 Submitted by: ydario Reviewed by: ydario Commit of changes for OS/2 CWS source code integration.
Diffstat (limited to 'store/util')
-rw-r--r--store/util/makefile.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/store/util/makefile.mk b/store/util/makefile.mk
index 78e235316..e4e23ff2f 100644
--- a/store/util/makefile.mk
+++ b/store/util/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.21 $
+# $Revision: 1.22 $
#
-# last change: $Author: vg $ $Date: 2007-10-15 12:23:00 $
+# last change: $Author: hr $ $Date: 2007-11-02 13:04:39 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -75,7 +75,7 @@ SHL1STDLIBS+=$(LIBSTLPORT)
.ENDIF
# On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
-.IF "$(COMID)"=="gcc3"
+.IF "$(COMID)"=="gcc3" && "$(GUI)"!="OS2"
.IF "$(GUI)"=="WNT"
SHL1STDLIBS+= -lsupc++
.ELSE