diff options
| author | hallgren <hallgren@chalmers.se> | 2011-11-01 13:45:12 +0000 |
|---|---|---|
| committer | hallgren <hallgren@chalmers.se> | 2011-11-01 13:45:12 +0000 |
| commit | f8665c7213426588e39db9afb4f18278b8ddffb8 (patch) | |
| tree | 36f64bf6b60037f2eee7271513d3013343f9f5e5 | |
| parent | 9ebb9c98b8fd8b7ae9652a540b551f9baa59e4ad (diff) | |
Remove configuration flag cclazy
| -rw-r--r-- | gf.cabal | 9 | ||||
| -rw-r--r-- | src/compiler/GF/Compile/Compute/Concrete.hs | 8 | ||||
| -rw-r--r-- | src/compiler/GF/Infra/BuildInfo.hs | 3 |
3 files changed, 3 insertions, 17 deletions
@@ -1,5 +1,5 @@ name: gf -version: 3.3 +version: 3.3-darcs cabal-version: >= 1.8 build-type: Custom @@ -37,10 +37,6 @@ flag server Description: Include --server mode Default: True -flag cclazy - Description: Use the new, lazy compute_concrete (faster than the old, strict version) - Default: True - library build-depends: base >= 4.2 && <5, array, @@ -205,6 +201,3 @@ executable gf other-modules: GF.System.UseSignal else other-modules: GF.System.NoSignal - - if flag(cclazy) - cpp-options: -DCC_LAZY diff --git a/src/compiler/GF/Compile/Compute/Concrete.hs b/src/compiler/GF/Compile/Compute/Concrete.hs index 58e52613e..f5a940022 100644 --- a/src/compiler/GF/Compile/Compute/Concrete.hs +++ b/src/compiler/GF/Compile/Compute/Concrete.hs @@ -1,7 +1,3 @@ -{-# LANGUAGE CPP #-} module GF.Compile.Compute.Concrete(module M) where -#ifdef CC_LAZY -import GF.Compile.Compute.ConcreteLazy as M -- New, experimental -#else -import GF.Compile.Compute.ConcreteStrict as M -- Old, trusted -#endif
\ No newline at end of file +import GF.Compile.Compute.ConcreteLazy as M -- New +--import GF.Compile.Compute.ConcreteStrict as M -- Old, inefficient diff --git a/src/compiler/GF/Infra/BuildInfo.hs b/src/compiler/GF/Infra/BuildInfo.hs index 74096994a..2ff770393 100644 --- a/src/compiler/GF/Infra/BuildInfo.hs +++ b/src/compiler/GF/Infra/BuildInfo.hs @@ -13,6 +13,3 @@ buildInfo = #ifdef SERVER_MODE ++" server" #endif -#ifdef CC_LAZY - ++ " cclazy" -#endif |