Implement archive loading for ghci

[ghc-hetmet.git] / compiler / ghc.mk

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 60123e9..f6530a6 100644 (file)
--- 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'                                >> $@