diff options
| author | Oliver Bolte <obo@openoffice.org> | 2000-12-21 12:24:08 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2000-12-21 12:24:08 +0000 |
| commit | 7baa3c3aa86f6c2510337ccc05ed4210dcdf0084 (patch) | |
| tree | 4beb05e070c779d0fc5cdf676ca39338f0a6a2ad /stoc | |
| parent | f922a92f5974a643ab6bff9b284aeeb361f4b4b5 (diff) | |
SRC614 for maxosx static member
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/javavm/makefile.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/stoc/source/javavm/makefile.mk b/stoc/source/javavm/makefile.mk index 8f2359b25743..44686a29ef40 100644 --- a/stoc/source/javavm/makefile.mk +++ b/stoc/source/javavm/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: rt $ $Date: 2000-11-13 17:34:02 $ +# last change: $Author: obo $ $Date: 2000-12-21 13:24:08 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -87,6 +87,12 @@ SLOFILES= \ $(SLO)$/javavm.obj \ $(SLO)$/jvmargs.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)$/staticmbjavavm.obj +.ENDIF SHL1TARGET= $(TARGET) |