X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghc.mk;h=357b51c5cc91eaeb773bf8521e03612302ad11b9;hb=7b0ff1792d699ff02a604163c9ccf4a98a1ca3eb;hp=c601f2994274f881862983250f8e0293a179480e;hpb=a3be88fd60cc63b97ec8509f46a8d93025760792;p=ghc-hetmet.git

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index c601f29..357b51c 100644
--- 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'                             >> $@
@@ -150,10 +152,6 @@ compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/.
 	@echo 'cGHC_UNLIT_PGM        = "$(GHC_UNLIT_PGM)"'                  >> $@
 	@echo 'cGHC_UNLIT_DIR        :: String'                             >> $@
 	@echo 'cGHC_UNLIT_DIR        = "$(GHC_UNLIT_DIR)"'                  >> $@
-	@echo 'cGHC_MANGLER_PGM      :: String'                             >> $@
-	@echo 'cGHC_MANGLER_PGM      = "$(GHC_MANGLER_PGM)"'                >> $@
-	@echo 'cGHC_MANGLER_DIR      :: String'                             >> $@
-	@echo 'cGHC_MANGLER_DIR      = "$(GHC_MANGLER_DIR)"'                >> $@
 	@echo 'cGHC_SPLIT_PGM        :: String'                             >> $@
 	@echo 'cGHC_SPLIT_PGM        = "$(GHC_SPLIT_PGM)"'                  >> $@
 	@echo 'cGHC_SPLIT_DIR        :: String'                             >> $@