X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rules%2Fextra-packages.mk;h=1cef9adbbc9535b6deef8ad70652e9eb8097e192;hp=c54c60496f1fb7269e78ad287563966734b20481;hb=7b0ff1792d699ff02a604163c9ccf4a98a1ca3eb;hpb=6a1dd52566ae92ce133e751d9a800a8631b05b73

diff --git a/rules/extra-packages.mk b/rules/extra-packages.mk
index c54c604..1cef9ad 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))),\
@@ -36,11 +36,9 @@ $$(foreach p,$$(patsubst libraries/%,%,$$(wildcard $$(shell grep '^[^ ]\+ \+\(dp
 endef
 
 define extra-package # $1 = package root, $2 = package
+$(call trace, extra-package($1,$2))
+
 EXTRA_PACKAGES += $2
-ifeq "$(wildcard libraries/$1/ghc-stage2-package)" ""
 $$(eval $$(call addPackage,$2))
-else
-$$(eval $$(call addPackage2,$2))
-endif
-endef
 
+endef