diff options
| author | Patrick Luby <pluby@openoffice.org> | 2001-02-12 00:33:49 +0000 |
|---|---|---|
| committer | Patrick Luby <pluby@openoffice.org> | 2001-02-12 00:33:49 +0000 |
| commit | 2b6c3d8714abac81955802fcb8704ee9a8bcf82e (patch) | |
| tree | dc29f65f7641efbd2afe5f648fef2e4a864471aa /vos | |
| parent | 88f90e59341f6291097bfbcdaddd67ebcbcdf6d8 (diff) | |
Removed NETBSD from staticmb*.cxx compiling
Diffstat (limited to 'vos')
| -rw-r--r-- | vos/source/makefile.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/vos/source/makefile.mk b/vos/source/makefile.mk index 17c743825942..69ba03e4c382 100644 --- a/vos/source/makefile.mk +++ b/vos/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: pluby $ $Date: 2001-02-10 21:32:14 $ +# last change: $Author: pluby $ $Date: 2001-02-12 01:33:45 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -98,10 +98,8 @@ 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" +.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" SLOFILES+=$(SLO)$/staticmb.obj .ENDIF @@ -139,10 +137,8 @@ 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" +.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" OBJFILES+=$(OBJ)$/staticmb.obj .ENDIF |