diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-08-19 22:47:09 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-08-19 22:47:09 +0000 |
| commit | aa5e377a4532df79dadafdb385a77d2e548ef32a (patch) | |
| tree | d4ff2efbde67299c320c1821342ef1c88be0b7c9 /compiler/ghc.mk | |
| parent | 3d80517affefabf7aac92262a7d9eb6077a7ada6 (diff) | |
| download | haskell-aa5e377a4532df79dadafdb385a77d2e548ef32a.tar.gz | |
Give each stage its own Config.hs
This also means the file is generated in a dist directory, not a
source directory.
Diffstat (limited to 'compiler/ghc.mk')
| -rw-r--r-- | compiler/ghc.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 5387c8bcfc..60123e9162 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -38,12 +38,12 @@ compiler_stage3_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES compiler_stage1_C_FILES_NODEPS = compiler/parser/cutils.c ifneq "$(BINDIST)" "YES" -compiler/stage1/package-data.mk : $(compiler_CONFIG_HS) -compiler/stage2/package-data.mk : $(compiler_CONFIG_HS) -compiler/stage3/package-data.mk : $(compiler_CONFIG_HS) +compiler/stage1/package-data.mk : compiler/stage1/build/Config.hs +compiler/stage2/package-data.mk : compiler/stage2/build/Config.hs +compiler/stage3/package-data.mk : compiler/stage3/build/Config.hs endif -$(compiler_CONFIG_HS) : mk/config.mk mk/project.mk +compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/. "$(RM)" $(RM_OPTS) $@ @echo 'Creating $@ ... ' @echo '{-# LANGUAGE CPP #-}' >> $@ @@ -140,7 +140,8 @@ else endif @echo done. -$(eval $(call clean-target,compiler,config_hs,$(compiler_CONFIG_HS))) +# XXX 2010-08-19: This is a legacy clean. Remove later. +$(eval $(call clean-target,compiler,config_hs,compiler/main/Config.hs)) # ----------------------------------------------------------------------------- # Create platform includes |