diff options
| author | Sander Vesik <svesik@openoffice.org> | 2001-02-02 16:02:45 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2001-02-02 16:02:45 +0000 |
| commit | df4d9510ea8ab358725bc2ceff8c98f08d88aa0d (patch) | |
| tree | 3232ba94d5011bfcbe8dc5238a4b4faca09193b6 /io | |
| parent | 5c9eca874b26cc19a1dcbc3411b6eddaa4d24c88 (diff) | |
Merge NetBSD changes by Michael Rauch from OO614B to HEAD.
Diffstat (limited to 'io')
| -rw-r--r-- | io/source/acceptor/makefile.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk index 34632cf252bf..21021ff4ac87 100644 --- a/io/source/acceptor/makefile.mk +++ b/io/source/acceptor/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: hr $ $Date: 2000-11-13 15:45:43 $ +# last change: $Author: svesik $ $Date: 2001-02-02 17:02:45 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,10 +86,8 @@ SLOFILES= \ $(SLO)$/acc_pipe.obj \ $(SLO)$/acc_socket.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)$/staticmbacceptor.obj .ENDIF |