Expose the dph packages automatically if -dph-* is set

[ghc-hetmet.git] / compiler / Makefile

diff --git a/compiler/Makefile b/compiler/Makefile
index 8dced37..912d6cc 100644 (file)
--- 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
 
@@ -174,7 +181,7 @@ CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
 
 boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) parser/Parser.y
-       test -e $(STAGE3_PACKAGE_CONF) || echo "[]" > $(STAGE3_PACKAGE_CONF)
+       test -f $(STAGE3_PACKAGE_CONF) || echo "[]" > $(STAGE3_PACKAGE_CONF)
        $(CABAL) configure --distpref dist-stage$* \
                           $(CONFIGURE_FLAGS_STAGE$*) \
                           $(INSTALL_DIRS_CONFIGURE_FLAGS) \
@@ -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