Commit a8defd8a authored by Ian Lynagh's avatar Ian Lynagh

Fix building of optional packages

The change to the packages file format broke it
parent 8f1523e9
# Despite the name "package", this file contains the master list of
# the *repositories* that make up GHC. It is parsed by boot and sync-all.
# the *repositories* that make up GHC. It is parsed by
# * boot
# * sync-all
# * rules/extra-packages.mk
#
# Some of this information is duplicated elsewhere in the build system:
# See Trac #3896
......
......@@ -27,7 +27,7 @@
# add P to the list of packages
define extra-packages
$$(foreach p,$$(patsubst libraries/%,%,$$(wildcard $$(shell grep '^[^ #][^ ]* \+\(dph\|extra\) \+[^ ]\+ \+[^ ]\+ \+[^ ]\+' packages | sed 's/ .*//'))),\
$$(foreach p,$$(patsubst libraries/%,%,$$(wildcard $$(shell grep '^[^ #][^ ]* \+\(dph\|extra\) \+[^ ]\+ \+[^ ]\+$$$$' packages | sed 's/ .*//'))),\
$$(if $$(wildcard libraries/$$p/ghc-packages),\
$$(eval BUILD_DIRS += libraries/$$p) \
$$(foreach q,$$(shell cat libraries/$$p/ghc-packages2),$$(eval $$(call extra-package,$$p,$$p/$$q))),\
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment