summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGene Anaya <ganaya@openoffice.org>2000-10-10 04:39:18 +0000
committerGene Anaya <ganaya@openoffice.org>2000-10-10 04:39:18 +0000
commit80e77a304e7b4d25496ef82dead027bc0bae2ee8 (patch)
treef8b20dbbd07b89a2a3c2b3a484ef4fe807bfae7e
parentd1fe38eceb19b055ea7baf23af78b20e46bff2f8 (diff)
Add staticmbinspect.cxx for macosx
-rw-r--r--stoc/source/inspect/makefile.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/stoc/source/inspect/makefile.mk b/stoc/source/inspect/makefile.mk
index fcc65bdf8748..e6f2ed53c6c1 100644
--- a/stoc/source/inspect/makefile.mk
+++ b/stoc/source/inspect/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.1.1.1 $
+# $Revision: 1.2 $
#
-# last change: $Author: hr $ $Date: 2000-09-18 15:29:33 $
+# last change: $Author: ganaya $ $Date: 2000-10-10 05:39:18 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -84,6 +84,12 @@ UNOTYPES=$($(TARGET)_XML2CMPTYPES)
SLOFILES= \
$(SLO)$/introspection.obj \
$(SLO)$/$(COMP1TYPELIST)_description.obj
+# NETBSD: somewhere we have to instantiate the static data members.
+# NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
+# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
+SLOFILES+=$(SLO)$/staticmbinspect.obj
+.ENDIF
SHL1TARGET= $(TARGET)