diff options
| author | Gene Anaya <ganaya@openoffice.org> | 2000-10-10 04:48:53 +0000 |
|---|---|---|
| committer | Gene Anaya <ganaya@openoffice.org> | 2000-10-10 04:48:53 +0000 |
| commit | 93056047ceafd0e9c772031a8fb6def9a2cd52cd (patch) | |
| tree | b0d77b1c2c527b012da424cbbf1fefc42627fc96 /stoc | |
| parent | ab6fb13e050fd97561a79980ccd996cc3f5f852a (diff) | |
add staticmbtypeconv.cxx for macx
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/typeconv/makefile.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/stoc/source/typeconv/makefile.mk b/stoc/source/typeconv/makefile.mk index 3165dcdf4fce..1b6a74609299 100644 --- a/stoc/source/typeconv/makefile.mk +++ b/stoc/source/typeconv/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:35 $ +# last change: $Author: ganaya $ $Date: 2000-10-10 05:48:53 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -83,6 +83,12 @@ UNOTYPES=$($(TARGET)_XML2CMPTYPES) SLOFILES= \ $(SLO)$/convert.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)$/staticmbtypeconv.obj +.ENDIF SHL1TARGET= $(TARGET) |