summaryrefslogtreecommitdiff
path: root/compiler/ghc.mk
diff options
context:
space:
mode:
authorsimonpj@microsoft.com <unknown>2010-08-13 14:01:52 +0000
committersimonpj@microsoft.com <unknown>2010-08-13 14:01:52 +0000
commit1caf694c7d5ea3699cfb988b25f0c850cedcd3e4 (patch)
tree1320a7d3cf1a735a76228b35d7e8966ab79f75fa /compiler/ghc.mk
parentc9020b2b6b0bee7ebe6f7bb0ba1b93680b0922c5 (diff)
downloadhaskell-1caf694c7d5ea3699cfb988b25f0c850cedcd3e4.tar.gz
Delete GhcLibProfiled
Simon M and I looked at this, and we think GhcLibProfiled is (a) not needed (b) confusing. Ian should review. Really, if GhcProfiled is on we should also check that 'p' is in the GhcLibWays
Diffstat (limited to 'compiler/ghc.mk')
-rw-r--r--compiler/ghc.mk8
1 files changed, 1 insertions, 7 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 54b3012274..5387c8bcfc 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -351,12 +351,7 @@ else
compiler_CONFIGURE_OPTS += --ghc-option=-DNO_REGS
endif
-# We need to turn on profiling either if we have been asked to
-# (GhcLibProfiled = YES) or if we want GHC itself to be compiled with
-# profiling enabled (GhcProfiled = YES).
-ifneq "$(GhcLibProfiled) $(GhcProfiled)" "NO NO"
-compiler_stage2_CONFIGURE_OPTS += --enable-library-profiling
-# And if we're profiling GHC then we want lots of SCCs.
+# If we're profiling GHC then we want lots of SCCs, so -auto-all
# We also don't want to waste time building the non-profiling library,
# either normally or for ghci. Unfortunately this means that we have to
# tell ghc-pkg --force as it gets upset when libHSghc-6.9.a doesn't
@@ -367,7 +362,6 @@ compiler_stage2_CONFIGURE_OPTS += --disable-library-vanilla
compiler_stage2_CONFIGURE_OPTS += --disable-library-for-ghci
compiler_stage2_CONFIGURE_OPTS += --ghc-pkg-option=--force
endif
-endif
ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
# The #include is vital for the via-C route with older compilers, else the C