diff options
| author | Matthias Huetsch <mhu@openoffice.org> | 2002-07-23 11:47:43 +0000 |
|---|---|---|
| committer | Matthias Huetsch <mhu@openoffice.org> | 2002-07-23 11:47:43 +0000 |
| commit | 5e62968ee4da0180d011468407af32ebb59bb826 (patch) | |
| tree | 096fff9ff1e8d4cbe19b4f9497b9a771359f6d1e /sal/util/makefile.mk | |
| parent | 2b595cc02293e40d6d9dbcdfc650c3bdd1b8ab1d (diff) | |
#i3980# Fixed (removed) default 'stlport' linkage.
Diffstat (limited to 'sal/util/makefile.mk')
| -rw-r--r-- | sal/util/makefile.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index 1c7a05b9655d..b423b7d3bca8 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.22 $ # -# last change: $Author: hjs $ $Date: 2002-04-15 10:06:24 $ +# last change: $Author: mhu $ $Date: 2002-07-23 12:47:43 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -66,8 +66,9 @@ $(PRJPCH)= PRJNAME=sal TARGET=sal +NO_BSYMBOLIC=TRUE +NO_DEFAULT_STL=TRUE USE_LDUMP2=TRUE -# NO_DEFAULT_STL=TRUE .IF "$(GUI)"!="OS2" USE_DEFFILE=TRUE @@ -149,12 +150,13 @@ SHL1STDLIBS+=-init InitLibrary -term ExitLibrary .IF "$(GUI)"=="UNX" .IF "$(OS)"=="SOLARIS" +# libposix4.so (SunOS 5.6) -> librt.so (SunOS >= 5.7) SHL1STDLIBS= -lpthread -lposix4 .IF "$(COM)" == "C50" SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract -.ENDIF -.ENDIF -.ENDIF +.ENDIF # C50 +.ENDIF # SOLARIS +.ENDIF # UNX .IF "$(GUI)"=="OS2" SHL1STDLIBS=n:\toolkit4\lib\so32dll.lib\ |