mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS geordi2q14 (1.11.10); FILE MERGED

Browse Source 
2004/01/30 12:57:09 hr 1.11.10.1: #111934#: merge CWS ooo111fix2
This commit is contained in:
Jens-Heiner Rechtien 2004-02-02 17:50:29 +00:00
parent 991081917b
commit dfdd705f1b
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
store/util/makefile.mk
View File

@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.11 $ # $Revision: 1.12 $
# #
# last change: $Author: hjs $ $Date: 2003-08-18 14:47:54 $ # last change: $Author: hr $ $Date: 2004-02-02 18:50:29 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
@ -102,14 +102,10 @@ SHL1STDLIBS= $(SALLIB)
# On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
.IF "$(COMID)"=="gcc3" .IF "$(COMID)"=="gcc3"
.IF "$(OS)"=="FREEBSD" .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX"
SHL1STDLIBS+= -lsupc++ SHL1STDLIBS+= -lsupc++
.ELSE .ELSE
.IF "$(OS)"!="MACOSX"
SHL1STDLIBS+= -lsupc++ -lgcc_s SHL1STDLIBS+= -lsupc++ -lgcc_s
.ELSE
SHL1STDLIBS+= -lsupc++
.ENDIF
.ENDIF .ENDIF
.ENDIF .ENDIF