diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 10:57:18 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 10:57:18 +0000 |
commit | cc325f1af161039e5030ce1724cfab82a2f7fe95 (patch) | |
tree | 2ddb8d4f056361412d1801853d491a5c9c9e063d /xmlhelp | |
parent | 85145e9dd1228ae86332da90b6579c9d502d712f (diff) |
INTEGRATION: CWS sb86 (1.32.6); FILE MERGED
2008/04/01 07:43:46 sb 1.32.6.1: #i84145# work around alleged compiler optimization error
Diffstat (limited to 'xmlhelp')
-rw-r--r-- | xmlhelp/source/com/sun/star/help/makefile.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk index f3c20d93e7b3..b194cf8715cf 100644 --- a/xmlhelp/source/com/sun/star/help/makefile.mk +++ b/xmlhelp/source/com/sun/star/help/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.33 $ +# $Revision: 1.34 $ # # This file is part of OpenOffice.org. # @@ -63,7 +63,15 @@ EXCEPTIONSFILES=\ $(OBJ)$/HelpCompiler.obj \ $(SLO)$/HelpLinker.obj \ $(SLO)$/HelpCompiler.obj - +.IF "$(OS)" == "MACOSX" && "$(CPU)" == "P" && "$(COM)" == "GCC" +# There appears to be a GCC 4.0.1 optimization error causing _file:good() to +# report true right before the call to writeOut at HelpLinker.cxx:1.12 l. 954 +# but out.good() to report false right at the start of writeOut at +# HelpLinker.cxx:1.12 l. 537: +NOOPTFILES=\ + $(OBJ)$/HelpLinker.obj \ + $(SLO)$/HelpLinker.obj +.ENDIF APP1TARGET= $(TARGET) APP1OBJS=\ |