summaryrefslogtreecommitdiff
path: root/solenv/inc/unxmacxp.mk
diff options
context:
space:
mode:
authorPatrick Luby <pluby@openoffice.org>2001-03-13 09:18:14 +0000
committerPatrick Luby <pluby@openoffice.org>2001-03-13 09:18:14 +0000
commit45b46acf3e9a3ada6e7a43fe20be37cee5ff0210 (patch)
tree3313176c537ebf9958509e5325302e696714ee31 /solenv/inc/unxmacxp.mk
parent3aa03afd599679d5d29e2495837564cd095fb738 (diff)
Reenabled turning off of optimatization when exceptions are turned on as the optimatization bug appears to still be present in Mac OS X Release Candidate
Diffstat (limited to 'solenv/inc/unxmacxp.mk')
-rw-r--r--solenv/inc/unxmacxp.mk9
1 files changed, 2 insertions, 7 deletions
diff --git a/solenv/inc/unxmacxp.mk b/solenv/inc/unxmacxp.mk
index 81d44832f3b6..680322a931fa 100644
--- a/solenv/inc/unxmacxp.mk
+++ b/solenv/inc/unxmacxp.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: unxmacxp.mk,v $
#
-# $Revision: 1.35 $
+# $Revision: 1.36 $
#
-# last change: $Author: pluby $ $Date: 2001-03-13 05:42:29 $
+# last change: $Author: pluby $ $Date: 2001-03-13 10:18:14 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -125,7 +125,6 @@ CFLAGSPROF=
CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
-.IF "$(shell uname -r)"=="1.2"
# Workaround for the compiler's buggy opitmizer when exceptions are turned on.
# Note that we have to define NO_OPTIMIZE for all files as once you turn off
# optimizing for one file, we need to adjust our compiling of the remaining
@@ -138,10 +137,6 @@ CFLAGSNOOPT=-O
CFLAGSOPT=
CFLAGSNOOPT=
.ENDIF
-.ELSE
-CFLAGSOPT=-O2
-CFLAGSNOOPT=-O
-.ENDIF
CFLAGSOUTOBJ=-o
SOLARVERSHLLIBS=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(LB)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST) 2>/dev/null | grep -E -v 'lib\w+static'")