summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages5
-rw-r--r--rules/extra-packages.mk2
2 files changed, 5 insertions, 2 deletions
diff --git a/packages b/packages
index 1489f3e98d..923b620ed5 100644
--- a/packages
+++ b/packages
@@ -1,5 +1,8 @@
# 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
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))),\