diff options
| -rw-r--r-- | compiler/ghc.mk | 6 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 4 | ||||
| -rw-r--r-- | utils/ghc-pkg/ghc.mk | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 5b59bbefb7..416d7bfc94 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -35,7 +35,7 @@ compiler/stage2/package-data.mk : $(compiler_CONFIG_HS) compiler/stage3/package-data.mk : $(compiler_CONFIG_HS) endif -$(compiler_CONFIG_HS) : mk/config.mk +$(compiler_CONFIG_HS) : mk/config.mk mk/project.mk "$(RM)" $(RM_OPTS) $@ @echo "Creating $@ ... " @echo "module Config where" >>$@ @@ -141,7 +141,7 @@ $(eval $(call clean-target,compiler,config_hs,$(compiler_CONFIG_HS))) PLATFORM_H = ghc_boot_platform.h -compiler/stage1/$(PLATFORM_H) : mk/config.mk +compiler/stage1/$(PLATFORM_H) : mk/config.mk mk/project.mk "$(MKDIRHIER)" $(dir $@) "$(RM)" $(RM_OPTS) $@ @echo "Creating $@..." @@ -188,7 +188,7 @@ endif # For stage2 and above, the BUILD platform is the HOST of stage1, and # the HOST platform is the TARGET of stage1. The TARGET remains the same # (stage1 is the cross-compiler, not stage2). -compiler/stage2/$(PLATFORM_H) : mk/config.mk +compiler/stage2/$(PLATFORM_H) : mk/config.mk mk/project.mk "$(MKDIRHIER)" $(dir $@) "$(RM)" $(RM_OPTS) $@ @echo "Creating $@..." diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index 6ae87e5cc3..c41cd01cd8 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -53,8 +53,8 @@ $(eval $(call all-target,$(GHC_CABAL_DIR),$(GHC_CABAL_INPLACE))) $(GHC_CABAL_DIR)_dist-dummy-ghc_MODULES = dummy-ghc $(GHC_CABAL_DIR)_dist-dummy-ghc_PROG = dummy-ghc$(exeext) -# depend on config.mk, so we pick up the new version number if it changes. -$(GHC_CABAL_DIR)/dist-dummy-ghc/build/dummy-ghc.hs : $(GHC_CABAL_DIR)/ghc.mk $(MKDIRHIER) mk/config.mk +# depend on project.mk, so we pick up the new version number if it changes. +$(GHC_CABAL_DIR)/dist-dummy-ghc/build/dummy-ghc.hs : $(GHC_CABAL_DIR)/ghc.mk $(MKDIRHIER) mk/project.mk "$(MKDIRHIER)" $(dir $@) echo "import System.Environment; import System.Cmd; import System.Exit" >$@ echo "main :: IO ()" >>$@ diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk index 0c99661ec6..289c67c328 100644 --- a/utils/ghc-pkg/ghc.mk +++ b/utils/ghc-pkg/ghc.mk @@ -61,7 +61,7 @@ utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG)$(exeext): utils/ghc-pkg/Main -ilibraries/extensible-exceptions \ -ilibraries/hpc -utils/ghc-pkg/Version.hs: mk/config.mk +utils/ghc-pkg/Version.hs: mk/project.mk "$(RM)" $(RM_OPTS) $@ echo "module Version where" >> $@ echo "version, targetOS, targetARCH :: String" >> $@ |