diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2009-05-13 14:44:44 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2009-05-13 14:44:44 +0000 |
| commit | e4b74d50df90bfdd78e279e4d29232648ca22180 (patch) | |
| tree | aa645eea4ee8b312f5b5dce7a7a19229f60f109b /utils/ghc-cabal | |
| parent | 436e13f5661e1a42c3ce51c0712e93280c90b213 (diff) | |
| download | haskell-e4b74d50df90bfdd78e279e4d29232648ca22180.tar.gz | |
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
Diffstat (limited to 'utils/ghc-cabal')
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index 6c6e6492b3..4ffab8b00c 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" >>$@ |