summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-10-03 20:41:44 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-10-09 16:21:14 -0400
commit817c1a947d50a070613815e02a530f83d9078eb8 (patch)
treea044789c0cbd1a3a73ed495afc599167aff39bbf /compiler
parent63a5371d420686f4959a5be9e5a0d3d647577615 (diff)
downloadhaskell-817c1a947d50a070613815e02a530f83d9078eb8.tar.gz
Define GHC_STAGE in headers instead of command-line
Diffstat (limited to 'compiler')
-rw-r--r--compiler/ghc.mk7
1 files changed, 1 insertions, 6 deletions
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