Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-7.2
http://hackage.haskell.org/trac/ghc/changeset/db4dcfd60e412ba29b6f494914df9083b71eca9c >--------------------------------------------------------------- commit db4dcfd60e412ba29b6f494914df9083b71eca9c Author: Simon Marlow <[email protected]> Date: Tue Jul 12 15:38:37 2011 +0100 make sure libraries/dph/ghc.mk is included after the other DPH ghc.mk files, so that it can refer to variables defined there. (necessary, but perhaps not sufficient, to fix the DPH build bugs) >--------------------------------------------------------------- ghc.mk | 5 ++++- rules/extra-packages.mk | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ghc.mk b/ghc.mk index 27c7886..46e0d94 100644 --- a/ghc.mk +++ b/ghc.mk @@ -616,7 +616,10 @@ endif # ---------------------------------------------- # Actually include all the sub-ghc.mk's -include $(patsubst %, %/ghc.mk, $(BUILD_DIRS)) +# BUILD_DIRS_EXTRA needs to come after BUILD_DIRS, because stuff in +# libraries/dph/ghc.mk refers to stuff defined earlier, in particular +# things like $(libraries/dph/dph-base_dist-install_GHCI_LIB) +include $(patsubst %, %/ghc.mk, $(BUILD_DIRS) $(BUILD_DIRS_EXTRA)) # A useful pseudo-target (must be after the include above, because it needs # the value of things like $(libraries/base_dist-install_v_LIB). diff --git a/rules/extra-packages.mk b/rules/extra-packages.mk index e3af94f..98868b4 100644 --- a/rules/extra-packages.mk +++ b/rules/extra-packages.mk @@ -27,9 +27,13 @@ # add P to the list of packages define extra-packages + +# Collects some dirs containing ghc.mk files that we need to include: +BUILD_DIRS_EXTRA= + $$(foreach p,$$(patsubst libraries/%,%,$$(wildcard $$(shell grep '^[^ #][^ ]* \+\(dph\|extra\) \+[^ ]\+ \+[^ ]\+$$$$' packages | sed 's/ .*//'))),\ $$(if $$(wildcard libraries/$$p/ghc-packages),\ - $$(eval BUILD_DIRS += libraries/$$p) \ + $$(eval BUILD_DIRS_EXTRA += libraries/$$p) \ $$(foreach q,$$(shell cat libraries/$$p/ghc-packages2),$$(eval $$(call extra-package,$$p,$$p/$$q))),\ $$(eval $$(call extra-package,$$p,$$p)))\ ) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
