summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-06-12 19:58:04 +0100
committerIan Lynagh <igloo@earth.li>2011-06-12 20:00:43 +0100
commita8defd8a5c2efbff5093717449afe73abb5cd8f7 (patch)
treeb91955dc87f78bcad51018d935fba52def0d5307 /rules
parent8f1523e9dcebfc5549e87de51359ea7b221809ab (diff)
downloadhaskell-a8defd8a5c2efbff5093717449afe73abb5cd8f7.tar.gz
Fix building of optional packages
The change to the packages file format broke it
Diffstat (limited to 'rules')
-rw-r--r--rules/extra-packages.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/extra-packages.mk b/rules/extra-packages.mk
index 1cef9adbbc..e3af94f8db 100644
--- a/rules/extra-packages.mk
+++ b/rules/extra-packages.mk
@@ -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))),\