X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghc.mk;h=0f419c62e6662ae80e16afced72b7032fd16806f;hb=08040f3e223222f26c13a8455e2d74bd623fda48;hp=7eaa1587cfaf48d3ab7ae3b5a20d02ed27b2782b;hpb=22294cdadb1ebb72aaffe3922010b810fec0530d;p=ghc-hetmet.git

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 7eaa158..0f419c6 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -136,6 +136,12 @@ ifeq "$(RelocatableBuild)" "YES"
 else
 	@echo 'cRelocatableBuild     = False'                               >> $@
 endif
+	@echo 'cUseArchivesForGhci   :: Bool'                               >> $@
+ifeq "$(UseArchivesForGhci)" "YES"
+	@echo 'cUseArchivesForGhci   = True'                                >> $@
+else
+	@echo 'cUseArchivesForGhci   = False'                               >> $@
+endif
 	@echo 'cLibFFI               :: Bool'                               >> $@
 ifeq "$(UseLibFFIForAdjustors)" "YES"
 	@echo 'cLibFFI               = True'                                >> $@
@@ -363,7 +369,12 @@ endif
 # exist.
 ifeq "$(GhcProfiled)" "YES"
 compiler_stage2_CONFIGURE_OPTS += --ghc-option=-auto-all
-compiler_stage2_CONFIGURE_OPTS += --disable-library-vanilla
+# We seem to still build the vanilla libraries even if we say
+# --disable-library-vanilla, but installation then fails, as Cabal
+# doesn't copy the vanilla .hi files, but ghc-pkg complains about
+# their absence when we register the package. So for now, we just
+# leave the vanilla libraries enabled.
+# compiler_stage2_CONFIGURE_OPTS += --disable-library-vanilla
 compiler_stage2_CONFIGURE_OPTS += --disable-library-for-ghci
 compiler_stage2_CONFIGURE_OPTS += --ghc-pkg-option=--force
 endif