strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge NetBSD changes by Michael Rauch from OO614B to HEAD.

Browse source
This commit is contained in:
Sander Vesik 2001-02-02 17:27:25 +00:00
parent 474ef21b7b
commit ee19b0e259
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configmgr/source/registry/makefile.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.2 $
# $Revision: 1.3 $
#
# last change: $Author: babak.mahbod $ $Date: 2000-09-23 08:04:53 $
# last change: $Author: svesik $ $Date: 2001-02-02 18:16:57 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -76,12 +76,10 @@ SLOFILES=\
$(SLO)$/configregistry.obj \
$(SLO)$/cfgregistrykey.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
# 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