rebase to ghc main repo

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

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 978835f..0def1c1 100644 (file)
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -110,12 +110,14 @@ compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/.
        @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 'cGccLinkerOpts        :: [String]'                           >> $@
+       @echo 'cGccLinkerOpts        = words "$(CONF_GCC_LINKER_OPTS_STAGE$*)"' >> $@
+       @echo 'cLdLinkerOpts         :: [String]'                           >> $@
+       @echo 'cLdLinkerOpts         = words "$(CONF_LD_LINKER_OPTS_STAGE$*)"'  >> $@
        @echo 'cIntegerLibrary       :: String'                             >> $@
        @echo 'cIntegerLibrary       = "$(INTEGER_LIBRARY)"'                >> $@
-       @echo 'cSplitObjs            :: String'                             >> $@
-       @echo 'cSplitObjs            = "$(SupportsSplitObjs)"'              >> $@
+       @echo 'cSupportsSplitObjs    :: String'                             >> $@
+       @echo 'cSupportsSplitObjs    = "$(SupportsSplitObjs)"'              >> $@
        @echo 'cGhcWithInterpreter   :: String'                             >> $@
        @echo 'cGhcWithInterpreter   = "$(GhcWithInterpreter)"'             >> $@
        @echo 'cGhcWithNativeCodeGen :: String'                             >> $@
@@ -535,7 +537,9 @@ compiler/stage1/inplace-pkg-config-munged: compiler/stage1/inplace-pkg-config
          < $< > $@
        "$(compiler_stage1_GHC_PKG)" update --force $(compiler_stage1_GHC_PKG_OPTS) $@
 
-$(compiler_stage1_v_LIB) : compiler/stage1/inplace-pkg-config-munged
+# We need to make sure the munged config is in the database before we
+# try to configure ghc-bin
+ghc/stage1/package-data.mk : compiler/stage1/inplace-pkg-config-munged
 endif
 
 endif