From 5e578e123d59c9590b4cf72515db448380de89bb Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Thu, 28 Oct 2010 10:16:24 +0000 Subject: [PATCH] Remove duplicate PrimopWrappers generation We were generating PrimopWrappers.hs twice in two different places, one for the normal build and one for Haddock (I think). Unfortunately one of these was causing extra rebuilding, because the file dropped into the dist-install/build/autogen directory, where it was picked up by the automatic HS_SRCS detection in subsequent make runs. This was exposed by a recent change to HS_SRCS: Wed Oct 20 11:47:59 BST 2010 Ian Lynagh * Look for sources in Cabal's autogen directory too This should fix the stage3 failures in the build bots. --- ghc.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ghc.mk b/ghc.mk index df51855..150ca7d 100644 --- a/ghc.mk +++ b/ghc.mk @@ -808,8 +808,7 @@ endif # Windows ifneq "$(BINDIST)" "YES" $(ghc-prim-$(libraries/ghc-prim_dist-install_VERSION)_HADDOCK_FILE): \ - libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs \ - libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs + libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs endif # BINDIST libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs: \ @@ -817,11 +816,6 @@ libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs: \ | $$(dir $$@)/. "$(GENPRIMOP_INPLACE)" --make-haskell-source < $< > $@ -libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs: \ - $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) \ - | $$(dir $$@)/. - "$(GENPRIMOP_INPLACE)" --make-haskell-wrappers < $< > $@ - .PHONY: tags tags: tags_compiler -- 1.7.10.4