summaryrefslogtreecommitdiffstats
path: root/connectivity/source/dbtools
diff options
context:
space:
mode:
authorGene Anaya <ganaya@openoffice.org>2001-02-08 02:42:40 +0000
committerGene Anaya <ganaya@openoffice.org>2001-02-08 02:42:40 +0000
commitf0abddb2e12952154f2851ab39101383f8f50368 (patch)
tree31f19a2a891331577e628289e4a17708a8c6f884 /connectivity/source/dbtools
parentAdded mapfile for Mac OS X (diff)
downloadcore-f0abddb2e12952154f2851ab39101383f8f50368.tar.gz
core-f0abddb2e12952154f2851ab39101383f8f50368.zip
Added UCBHELPER for MacOS X static symbols
Diffstat (limited to 'connectivity/source/dbtools')
-rw-r--r--connectivity/source/dbtools/makefile.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk
index 4abebfc81121..448f5a6834e2 100644
--- a/connectivity/source/dbtools/makefile.mk
+++ b/connectivity/source/dbtools/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.1 $
+# $Revision: 1.2 $
#
-# last change: $Author: oj $ $Date: 2001-01-08 12:32:24 $
+# last change: $Author: ganaya $ $Date: 2001-02-08 03:42:40 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -95,6 +95,12 @@ SHL1STDLIBS=\
$(SALLIB) \
$(COMPHELPERLIB)
+# 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
+SHL1STDLIBS+=$(UCBHELPERLIB)
+.ENDIF
+
.IF "$(COMPHELPERLIB)" == ""
SHL1STDLIBS+= icomphelp2.lib
.ENDIF