diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2010-10-28 10:16:24 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2010-10-28 10:16:24 +0000 |
| commit | 5e578e123d59c9590b4cf72515db448380de89bb (patch) | |
| tree | fa304b9610cd4675c64fb779fba57795227acca9 /ghc.mk | |
| parent | 988a0bbe45b97f7dce825af25890f80765a980f8 (diff) | |
| download | haskell-5e578e123d59c9590b4cf72515db448380de89bb.tar.gz | |
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 <igloo@earth.li>
* Look for sources in Cabal's autogen directory too
This should fix the stage3 failures in the build bots.
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -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 |