From d84423b4f480e1d4cc57194632d47e0db742b648 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Mon, 2 Feb 2004 17:09:37 +0000 Subject: INTEGRATION: CWS geordi2q14 (1.17.30); FILE MERGED 2004/01/29 18:32:59 hr 1.17.30.1: #111934#: merge CWS ooo111fix2 --- salhelper/source/makefile.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'salhelper') 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 -- cgit v1.2.3