summaryrefslogtreecommitdiff
path: root/salhelper
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-02-02 17:09:37 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-02-02 17:09:37 +0000
commitd84423b4f480e1d4cc57194632d47e0db742b648 (patch)
tree2012c2008ce5b2cef58f34c7d2ee0aa63b887883 /salhelper
parentcddec43a9ce244af3367cdc8721caacc8c607a05 (diff)
INTEGRATION: CWS geordi2q14 (1.17.30); FILE MERGED
2004/01/29 18:32:59 hr 1.17.30.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'salhelper')
-rw-r--r--salhelper/source/makefile.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk
index 2c25fef99c52..aa035a58c51c 100644
--- a/salhelper/source/makefile.mk
+++ b/salhelper/source/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.17 $
+# $Revision: 1.18 $
#
-# last change: $Author: hr $ $Date: 2003-07-16 17:30:45 $
+# last change: $Author: hr $ $Date: 2004-02-02 18:09:37 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -86,8 +86,8 @@ SLOFILES= \
$(SLO)$/dynload.obj \
$(SLO)$/simplereferenceobject.obj
-# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
-.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)$(CVER)"=="MACOSXC295"
+# SCO: the linker does know about weak symbols, but we can't ignore multiple defined symbols
+.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC"
SLOFILES+=$(SLO)$/staticmb.obj
.ENDIF