X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghc.mk;h=0f419c62e6662ae80e16afced72b7032fd16806f;hb=50609bd7584ee3fdcb3db820cb81e574f0523010;hp=f6530a6721a7eeafe77c4ebea638bb53f8e97390;hpb=b8384ce5da4738c0a6d3eaf11de03cab3ddd3cd6;p=ghc-hetmet.git

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index f6530a6..0f419c6 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -369,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