diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2003-06-12 10:09:22 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2003-06-12 10:09:22 +0000 |
commit | 21f311f7cb78e6135e363817cf04885686df7a19 (patch) | |
tree | 505250872a237b24523bfec05f03afca7efa3b71 /store/util | |
parent | abddba800f70a07a0e2e04838583501270580ad6 (diff) |
INTEGRATION: CWS mh11rc (1.8.10); FILE MERGED
2003/06/06 09:53:50 mh 1.8.10.1: join: from beta2
Diffstat (limited to 'store/util')
-rw-r--r-- | store/util/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/store/util/makefile.mk b/store/util/makefile.mk index 1162a287f318..abfa1af4d966 100644 --- a/store/util/makefile.mk +++ b/store/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: hr $ $Date: 2003-03-27 14:06:40 $ +# last change: $Author: vg $ $Date: 2003-06-12 11:09:22 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -102,8 +102,12 @@ SHL1STDLIBS= $(SALLIB) # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so .IF "$(COMID)"=="gcc3" +.IF "$(OS)"=="FREEBSD" +SHL1STDLIBS+= -lsupc++ +.ELSE SHL1STDLIBS+= -lsupc++ -lgcc_s .ENDIF +.ENDIF SHL1DEF= $(MISC)$/$(SHL1TARGET).def |