diff options
Diffstat (limited to 'connectivity/source/dbtools/makefile.mk')
| -rwxr-xr-x[-rw-r--r--] | connectivity/source/dbtools/makefile.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk index a73dae3d047d..90237153de77 100644..100755 --- a/connectivity/source/dbtools/makefile.mk +++ b/connectivity/source/dbtools/makefile.mk @@ -57,8 +57,8 @@ SHL1TARGET= $(DBTOOLS_TARGET)$(DLLPOSTFIX) SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(SALLIB) \ + $(SALHELPERLIB) \ $(JVMACCESSLIB) \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ @@ -67,12 +67,11 @@ SHL1STDLIBS=\ # 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" +# MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols +.IF "$(OS)"=="NETBSD" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" SHL1STDLIBS+=$(UCBHELPERLIB) .ENDIF -#SHL1DEPN= SHL1IMPLIB= idbtools SHL1LIBS= $(LIB1TARGET) |