diff options
| author | Oliver Bolte <obo@openoffice.org> | 2000-12-21 12:53:44 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2000-12-21 12:53:44 +0000 |
| commit | f4d6078438bffbddf597ec31019b0ac0918ce1c1 (patch) | |
| tree | 328131e0bb089eb42ef8978e98db149847640554 /stoc/source/javaloader | |
| parent | 7baa3c3aa86f6c2510337ccc05ed4210dcdf0084 (diff) | |
SRC614 for maxosx static member
Diffstat (limited to 'stoc/source/javaloader')
| -rw-r--r-- | stoc/source/javaloader/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/stoc/source/javaloader/makefile.mk b/stoc/source/javaloader/makefile.mk index 2ac555669404..145c551e3f86 100644 --- a/stoc/source/javaloader/makefile.mk +++ b/stoc/source/javaloader/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: hr $ $Date: 2000-11-13 16:55:30 $ +# last change: $Author: obo $ $Date: 2000-12-21 13:53:44 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -101,6 +101,13 @@ UNOTYPES= \ SLOFILES= $(SLO)$/javaloader.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)$/staticmbjavaloader.obj +.ENDIF + SHL1TARGET= $(TARGET) SHL1STDLIBS=\ |