Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-generics
http://hackage.haskell.org/trac/ghc/changeset/54ca48a98d49f21bb485241e85ed473236420b6d >--------------------------------------------------------------- commit 54ca48a98d49f21bb485241e85ed473236420b6d Author: Jose Pedro Magalhaes <[email protected]> Date: Thu May 5 13:26:24 2011 +0200 Do not enable -XGenerics when building the optimized libs. >--------------------------------------------------------------- mk/build.mk.sample | 2 +- mk/config.mk.in | 7 +------ mk/validate-settings.mk | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/mk/build.mk.sample b/mk/build.mk.sample index 216ca66..a31b576 100644 --- a/mk/build.mk.sample +++ b/mk/build.mk.sample @@ -39,7 +39,7 @@ SRC_HC_OPTS = -O -H64m GhcStage1HcOpts = -O -fasm GhcStage2HcOpts = -O2 -fasm GhcHcOpts = -Rghc-timing -GhcLibHcOpts = -O2 -XGenerics +GhcLibHcOpts = -O2 GhcLibWays += p ifeq "$(PlatformSupportsSharedLibs)" "YES" diff --git a/mk/config.mk.in b/mk/config.mk.in index 3749bce..d4a7cbe 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -282,13 +282,8 @@ GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO) # # -O(2) is pretty desirable, otherwise no inlining of prelude # things (incl "+") happens when compiling with this compiler -# -# -XGenerics switches on generation of support code for -# derivable type classes. This is now off by default, -# but we switch it on for the libraries so that we generate -# the code in case someone importing wants it -GhcLibHcOpts=-O2 -XGenerics +GhcLibHcOpts=-O2 # Strip local symbols from libraries? This can make the libraries smaller, # but makes debugging somewhat more difficult. Doesn't work with all ld's. diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk index c000f85..b7f788b 100644 --- a/mk/validate-settings.mk +++ b/mk/validate-settings.mk @@ -36,8 +36,7 @@ ifeq "$(ValidateHpc)" "YES" GhcStage2HcOpts += -fhpc -hpcdir $(TOP)/testsuite/hpc_output/ endif ifeq "$(ValidateSlow)" "YES" -GhcStage2HcOpts += -XGenerics -DDEBUG -GhcLibHcOpts += -XGenerics +GhcStage2HcOpts += -DDEBUG endif ###################################################################### _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
