X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=912d6cc43aa6fad943e9c352a4fc298fcea0a860;hb=447c0b257a0e8df3b79422b17ec2cf1d952027f3;hp=6ea209be949b7e61dc4ddf6941d62e3047ebed99;hpb=9c325bab1e7ed7d305a79ef9e366b6ac87b8b1b6;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 6ea209b..912d6cc 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -144,9 +144,16 @@ endif
 # profiling enabled (GhcProfiled = YES).
 ifneq "$(GhcLibProfiled) $(GhcProfiled)" "NO NO"
 CONFIGURE_FLAGS_STAGE2 += --enable-library-profiling
-# And if we're profiling GHC then we want lots of SCCs
+# And if we're profiling GHC then we want lots of SCCs.
+# 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
+# exist.
 ifeq "$(GhcProfiled)" "YES"
 CONFIGURE_FLAGS_STAGE2 += --ghc-option=-auto-all
+CONFIGURE_FLAGS_STAGE2 += --disable-library-vanilla
+CONFIGURE_FLAGS_STAGE2 += --disable-library-for-ghci
+CONFIGURE_FLAGS_STAGE2 += --ghc-pkg-option=--force
 endif
 endif
 
@@ -460,5 +467,5 @@ BINDIST_EXTRAS += stage2plus/ghc_boot_platform.h
 endif
 
 include $(TOP)/mk/bindist.mk
-LIB_DIST_DIR = dist-stage$(stage)
+LIB_DIST_DIR = dist-stage2