From 817c1a947d50a070613815e02a530f83d9078eb8 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 3 Oct 2019 20:41:44 -0400 Subject: Define GHC_STAGE in headers instead of command-line --- compiler/ghc.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'compiler/ghc.mk') diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 8703e247c8..de14a01646 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -93,7 +93,7 @@ compiler/stage$1/build/Config.hs : mk/config.mk mk/project.mk | $$$$(dir $$$$@)/ @echo 'cBooterVersion = "$(GhcVersion)"' >> $$@ @echo >> $$@ @echo 'cStage :: String' >> $$@ - @echo 'cStage = show (GHC_STAGE :: Int)' >> $$@ + @echo 'cStage = show ($1 :: Int)' >> $$@ @echo done. endef @@ -270,11 +270,6 @@ endif compiler_stage3_CONFIGURE_OPTS := $(compiler_stage2_CONFIGURE_OPTS) -compiler_stage1_CONFIGURE_OPTS += --ghc-option=-DGHC_STAGE=1 -compiler_stage2_CONFIGURE_OPTS += --ghc-option=-DGHC_STAGE=2 -compiler_stage3_CONFIGURE_OPTS += --ghc-option=-DGHC_STAGE=3 -compiler_stage2_HADDOCK_OPTS += --optghc=-DGHC_STAGE=2 - compiler/stage1/package-data.mk : compiler/ghc.mk compiler/stage2/package-data.mk : compiler/ghc.mk compiler/stage3/package-data.mk : compiler/ghc.mk -- cgit v1.2.1