From e4b74d50df90bfdd78e279e4d29232648ca22180 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 13 May 2009 14:44:44 +0000 Subject: [PATCH] dummy-ghc should depend on config.mk, to pick up the latest version number This fixes build problems of the form ghc-cabal: Version mismatch between ghc and ghc-pkg --- utils/ghc-cabal/ghc.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index 6c6e649..4ffab8b 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -53,7 +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) -$(GHC_CABAL_DIR)/dist-dummy-ghc/build/dummy-ghc.hs : $(GHC_CABAL_DIR)/ghc.mk $(MKDIRHIER) +# 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) $(TOP)/mk/config.mk $(MKDIRHIER) $(dir $@) echo "import System.Environment; import System.Cmd; import System.Exit" >$@ echo "main = do args <- getArgs; if args == [\"--numeric-version\"] then putStrLn \"$(ProjectVersion)\" else do e <- rawSystem \"$(GHC_STAGE0)\" args; exitWith e" >>$@ -- 1.7.10.4