diff options
| author | Patrick Luby <pluby@openoffice.org> | 2001-02-10 20:33:58 +0000 |
|---|---|---|
| committer | Patrick Luby <pluby@openoffice.org> | 2001-02-10 20:33:58 +0000 |
| commit | 88f90e59341f6291097bfbcdaddd67ebcbcdf6d8 (patch) | |
| tree | fcb939a70b2119627460e47674e57561a21f365e /vos/source | |
| parent | d2605036563032b64ba60962d5c36889162aaecb (diff) | |
Consolidated common Mac OS X static data member initializations into vos project
Diffstat (limited to 'vos/source')
| -rw-r--r-- | vos/source/makefile.mk | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/vos/source/makefile.mk b/vos/source/makefile.mk index 408b2efc8df3..17c743825942 100644 --- a/vos/source/makefile.mk +++ b/vos/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: pluby $ $Date: 2000-12-14 07:35:19 $ +# last change: $Author: pluby $ $Date: 2001-02-10 21:32:14 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -98,6 +98,12 @@ SLOFILES= $(SLO)$/acceptor.obj \ $(SLO)$/xception.obj \ $(SLO)$/evtque.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)$/staticmb.obj +.ENDIF # $(SLO)$/evtque.obj @@ -133,6 +139,13 @@ OBJFILES= $(OBJ)$/acceptor.obj \ $(OBJ)$/xception.obj \ $(OBJ)$/evtque.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" +OBJFILES+=$(OBJ)$/staticmb.obj +.ENDIF + # $(SLO)$/evtque.obj .ENDIF |