diff options
| author | Gene Anaya <ganaya@openoffice.org> | 2001-01-30 15:57:06 +0000 |
|---|---|---|
| committer | Gene Anaya <ganaya@openoffice.org> | 2001-01-30 15:57:06 +0000 |
| commit | 90f54dbb07ae12a2ab2fbc8b7875a39318e0832d (patch) | |
| tree | 1686009e7276ffa4f4007b27425719e3d9ece261 | |
| parent | e43cc5d15e7bc947e3af2088e920460365a69e02 (diff) | |
added UCBHELPER's library to the link (-l) line for MacOS X. This is to
prevent duplicate static data members being defined at link time.
| -rw-r--r-- | connectivity/source/manager/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk index 12780592d2eb..e8521120f85f 100644 --- a/connectivity/source/manager/makefile.mk +++ b/connectivity/source/manager/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: patrick.luby $ $Date: 2000-09-25 04:28:50 $ +# last change: $Author: ganaya $ $Date: 2001-01-30 16:57:06 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -128,6 +128,13 @@ SHL1STDLIBS=\ $(OSLLIB) \ $(SALLIB) +# 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" +SHL1STDLIBS+=$(UCBHELPERLIB) +.ENDIF + SHL1DEPN= SHL1IMPLIB= i$(SHL1TARGET) |