diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 13:06:40 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 13:06:40 +0000 |
commit | f26f117c6cdeab38ceda7bbba7f005e9c2d97ef4 (patch) | |
tree | 1a7d156dcb3bfedeaed1d99acc8d3421ae1a0f10 /store/util | |
parent | MWS_SRX644: migrate branch mws_srx644 -> HEAD (diff) | |
download | core-f26f117c6cdeab38ceda7bbba7f005e9c2d97ef4.tar.gz core-f26f117c6cdeab38ceda7bbba7f005e9c2d97ef4.zip |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'store/util')
-rw-r--r-- | store/util/makefile.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/store/util/makefile.mk b/store/util/makefile.mk index 8fbde8cb149c..1162a287f318 100644 --- a/store/util/makefile.mk +++ b/store/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: mhu $ $Date: 2002-08-22 15:31:09 $ +# last change: $Author: hr $ $Date: 2003-03-27 14:06:40 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -99,9 +99,12 @@ SHL1VERSIONMAP= $(TARGET).map .ENDIF SHL1STDLIBS= $(SALLIB) -.IF "$(COM)"=="GCC" -SHL1STDLIBS+= -lsupc++ -.ENDIF # GCC + +# On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so +.IF "$(COMID)"=="gcc3" +SHL1STDLIBS+= -lsupc++ -lgcc_s +.ENDIF + SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1DEPN= $(L)$/isal.lib |