summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2010-10-16 12:34:21 +0000
committerIan Lynagh <igloo@earth.li>2010-10-16 12:34:21 +0000
commitf93092f9c537cdeed37ad28a1e509d0d04459289 (patch)
treee0b11506e0b31440e320ec8ae9c5845b790bf607
parent57fcae702f10232bf9d09322caa845417034cc45 (diff)
downloadhaskell-f93092f9c537cdeed37ad28a1e509d0d04459289.tar.gz
Correct the regexp used to search for extra packages
We weren't ignoring comment lines
-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 271bc6d057..1cef9adbbc 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))),\