X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghc.mk;h=0f419c62e6662ae80e16afced72b7032fd16806f;hb=1e70cb6e14de98a75207796a2fb8eb7de03ea779;hp=60123e9162a8a891163c2f4ccfcfcde3eead09aa;hpb=aa5e377a4532df79dadafdb385a77d2e548ef32a;p=ghc-hetmet.git

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 60123e9..0f419c6 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -70,6 +70,10 @@ compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/.
 	@echo 'cBooterVersion        = "$(GhcVersion)"'                     >> $@
 	@echo 'cStage                :: String'                             >> $@
 	@echo 'cStage                = show (STAGE :: Int)'                 >> $@
+	@echo 'cCcOpts               :: [String]'                           >> $@
+	@echo 'cCcOpts               = words "$(CONF_CC_OPTS_STAGE$*)"'     >> $@
+	@echo 'cLdOpts               :: [String]'                           >> $@
+	@echo 'cLdOpts               = words "$(CONF_LD_OPTS_STAGE$*)"'     >> $@
 	@echo 'cIntegerLibrary       :: String'                             >> $@
 	@echo 'cIntegerLibrary       = "$(INTEGER_LIBRARY)"'                >> $@
 	@echo 'cSplitObjs            :: String'                             >> $@
@@ -132,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'                                >> $@
@@ -359,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