diff options
| author | Gene Anaya <ganaya@openoffice.org> | 2000-10-10 04:37:02 +0000 |
|---|---|---|
| committer | Gene Anaya <ganaya@openoffice.org> | 2000-10-10 04:37:02 +0000 |
| commit | 2b7615c7e845f033bd9de7393c8cf183f5ad4521 (patch) | |
| tree | ee0dccc21e3c695b787c62d023699ab2836e5f3d /stoc | |
| parent | e3d6f58cf3937d0a15b91027e3d360ea534a8293 (diff) | |
Added staticmbdefaultregistry.cxx for macosx
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/defaultregistry/makefile.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/stoc/source/defaultregistry/makefile.mk b/stoc/source/defaultregistry/makefile.mk index af0e7cd2f347..38e8802a3c3b 100644 --- a/stoc/source/defaultregistry/makefile.mk +++ b/stoc/source/defaultregistry/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:37:02 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,6 +86,14 @@ SLOFILES= \ $(SLO)$/defaultregistry.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)$/staticmbdefaultregistry.obj +.ENDIF + + SHL1TARGET= $(TARGET) SHL1STDLIBS= \ |