summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhallgren <hallgren@chalmers.se>2011-09-09 16:17:33 +0000
committerhallgren <hallgren@chalmers.se>2011-09-09 16:17:33 +0000
commitc8501547bf94c0325626fea994c8d5e534630b95 (patch)
treed35bd21e01ef6281ce226d39d8de07d8a0656d73
parent0bc4513ae5473f99e321d83232d51ee30bafcc55 (diff)
Don't make noexpand the default with -fcclazy
This reverts the previous change. Not preprocessing opers turns out to make a difference in what needs to be mentioned in restricted inheritance/imports.
-rw-r--r--src/compiler/GF/Infra/Option.hs9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/compiler/GF/Infra/Option.hs b/src/compiler/GF/Infra/Option.hs
index e121abfb6..27594f57f 100644
--- a/src/compiler/GF/Infra/Option.hs
+++ b/src/compiler/GF/Infra/Option.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
module GF.Infra.Option
(
-- * Option types
@@ -269,11 +268,11 @@ defaultFlags = Flags {
optResName = Nothing,
optPreprocessors = [],
optEncoding = "latin1",
-#ifdef CC_LAZY
- optOptimizations = Set.fromList [OptStem,OptCSE],
-#else
+-- #ifdef CC_LAZY
+-- optOptimizations = Set.fromList [OptStem,OptCSE],
+-- #else
optOptimizations = Set.fromList [OptStem,OptCSE,OptExpand,OptParametrize],
-#endif
+-- #endif
optOptimizePGF = False,
optMkIndexPGF = False,
optCFGTransforms = Set.fromList [CFGRemoveCycles, CFGBottomUpFilter,