diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-04-16 10:13:46 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-04-16 10:13:46 +0000 |
| commit | 2b1b54ca8375dfcdbcc7830b0ab27b31f319a75d (patch) | |
| tree | 996854b18d332b12949c9fb367980fd01f5e5794 /sal/util | |
| parent | 78944a95f58e3a8a2db98401e29325c3d0cc0ae1 (diff) | |
INTEGRATION: CWS pj76 (1.40.26); FILE MERGED
2007/03/18 16:48:30 pjanik 1.40.26.1: #i75485#: Remove (wrong) stlport linking on Mac OS X.
Diffstat (limited to 'sal/util')
| -rw-r--r-- | sal/util/makefile.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index da449c18e..49d2e7e85 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.41 $ +# $Revision: 1.42 $ # -# last change: $Author: vg $ $Date: 2007-03-26 14:27:33 $ +# last change: $Author: ihi $ $Date: 2007-04-16 11:13:46 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -146,10 +146,6 @@ SHL1STDLIBS+=$(LIBSTLPORT) #stlport is not lost on me .IF "$(USE_SYSTEM_STL)"=="YES" SHL1STDLIBS+=$(LIBSTLPORT) -.ELSE -.IF "$(OS)"=="MACOSX" -SHL1STDLIBS+=-lstlport_gcc -.ENDIF .ENDIF .IF "$(OS)"=="MACOSX" |