diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-16 13:26:34 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-16 16:28:46 +0100 |
| commit | 204ef36da8d04524cc6577976883c931c6026004 (patch) | |
| tree | 2806ea17ed28fd86fb8039762cf2cb8ed111ce99 | |
| parent | d2a1f392c10f177e005df319756223855cb9c77e (diff) | |
Remove SCO support
| -rw-r--r-- | connectivity/source/dbtools/makefile.mk | 4 | ||||
| -rw-r--r-- | xmloff/util/makefile.mk | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk index 1dab5a6f7368..294c9a02f37f 100644 --- a/connectivity/source/dbtools/makefile.mk +++ b/connectivity/source/dbtools/makefile.mk @@ -67,8 +67,8 @@ 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 diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk index 54274673a873..fb0979f4cf45 100644 --- a/xmloff/util/makefile.mk +++ b/xmloff/util/makefile.mk @@ -69,11 +69,6 @@ SHL1STDLIBS= \ $(UNOTOOLSLIB) \ $(BASEGFXLIB) -# SCO: the linker does know about weak symbols, but we can't ignore multiple defined symbols -.IF "(OS)"=="SCO" -SHL1STDLIBS+=-licg617mxp -.ENDIF - SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1LIBS= $(LIB1TARGET) |