diff options
| author | Gene Anaya <ganaya@openoffice.org> | 2000-10-10 04:41:55 +0000 |
|---|---|---|
| committer | Gene Anaya <ganaya@openoffice.org> | 2000-10-10 04:41:55 +0000 |
| commit | 93ab9400bb5666a25a6ac60350c3c1ca23689108 (patch) | |
| tree | 83da727390166582666bfbdaab7ee6bac80468f0 /stoc | |
| parent | 3fc8c2a0eee176db74d259a06d198e419b5b641c (diff) | |
add staticmbloader.cxx for macosx
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/loader/makefile.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/stoc/source/loader/makefile.mk b/stoc/source/loader/makefile.mk index fe8393882519..ffeefbd6b184 100644 --- a/stoc/source/loader/makefile.mk +++ b/stoc/source/loader/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:34 $ +# last change: $Author: ganaya $ $Date: 2000-10-10 05:41:55 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -85,6 +85,14 @@ SLOFILES= \ $(SLO)$/dllcomponentloader.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)$/staticmbloader.obj +.ENDIF + + SHL1TARGET= $(TARGET) SHL1STDLIBS= \ |