diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-04-06 09:09:10 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-04-06 09:09:10 +0000 |
| commit | 773114e565525269dc11edfc5d881eb42b578b40 (patch) | |
| tree | 1a04d8f74bd3a79c50636bd390e8efd9de98a243 /slideshow | |
| parent | 0929a842c9640d4682e0f23ff3f6abe2c421b118 (diff) | |
INTEGRATION: CWS ccpatch (1.8.4); FILE MERGED
2005/04/04 10:07:45 dbo 1.8.4.2: #i43928# root cause for crash in eventmultiplexer.cxx was sunpro CC problem with opt -xO3
Issue number:
Submitted by:
Reviewed by:
2005/04/01 14:04:17 dbo 1.8.4.1: #120732# using optimization for sunpro CC again except for smilfunctionparser.cxx, eventmultiplexer.cxx;
worked around safe_bool idiom optimizer bug in boost (CC -xO3 ...)
Issue number:
Submitted by:
Reviewed by:
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/makefile.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/slideshow/source/engine/makefile.mk b/slideshow/source/engine/makefile.mk index 186a2f5b648f..f5a62b5c95b6 100644 --- a/slideshow/source/engine/makefile.mk +++ b/slideshow/source/engine/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: rt $ $Date: 2005-03-30 07:55:03 $ +# last change: $Author: hr $ $Date: 2005-04-06 10:09:10 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -74,12 +74,11 @@ ENABLE_EXCEPTIONS=TRUE # --- Common ---------------------------------------------------------- -# # Disable optimization for SunCC SPARC (funny loops -# # when parsing e.g. "x+width/2") -# .IF "$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC" -# NOOPTFILES= $(SLO)$/smilfunctionparser.obj \ -# $(SLO)$/eventmultiplexer.obj -# .ENDIF +# Disable optimization for SunCC (funny loops +# when parsing e.g. "x+width/2") +.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC" +NOOPTFILES= $(SLO)$/smilfunctionparser.obj +.ENDIF # same issue for MACOSX .IF "$(OS)"=="MACOSX" NOOPTFILES= $(SLO)$/smilfunctionparser.obj |