diff options
| -rw-r--r-- | mk/build.mk.sample | 2 | ||||
| -rw-r--r-- | mk/config.mk.in | 7 | ||||
| -rw-r--r-- | 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 216ca66c1b..a31b57618b 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 3749bce6b6..d4a7cbeaf0 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 c000f852a5..b7f788b6b9 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 ###################################################################### |