diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-10-17 13:21:21 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-10-17 13:21:21 +0000 |
| commit | 22519591a7ed4047ca562cca0ac72d3e43637e02 (patch) | |
| tree | f325618da1f2a85dc8c9f434be61af105136e6e5 | |
| parent | af91f9416d98ab31e1a89f7e54f1d2a2bdaa02e8 (diff) | |
INTEGRATION: CWS macosxgcc4 (1.12.38); FILE MERGED
2005/09/20 00:04:17 fheckl 1.12.38.2: RESYNC: (1.12-1.13); FILE MERGED
2005/09/17 23:20:32 fheckl 1.12.38.1: change linked libs for use with gcc4 on MacOSX (i54460)
| -rw-r--r-- | store/util/makefile.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/store/util/makefile.mk b/store/util/makefile.mk index 44d4dd84b24e..f9a3682590af 100644 --- a/store/util/makefile.mk +++ b/store/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.13 $ +# $Revision: 1.14 $ # -# last change: $Author: rt $ $Date: 2005-09-08 08:48:51 $ +# last change: $Author: rt $ $Date: 2005-10-17 14:21:21 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -75,8 +75,12 @@ SHL1STDLIBS= $(SALLIB) # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so .IF "$(COMID)"=="gcc3" -.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX" +.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" SHL1STDLIBS+= -lsupc++ +.ELIF "$(OS)"=="MACOSX" +.IF "$(CCNUMVER)"<="000399999999" +SHL1STDLIBS+= -lsupc++ +.ENDIF # CCNUMVER .ELSE SHL1STDLIBS+= -lsupc++ -lgcc_s .ENDIF |