Fix building of optional packages

[ghc-hetmet.git] / rules / extra-packages.mk

diff --git a/rules/extra-packages.mk b/rules/extra-packages.mk
index 134fa42..e3af94f 100644 (file)
--- a/rules/extra-packages.mk
+++ b/rules/extra-packages.mk
@@ -10,20 +10,35 @@
 #
 # -----------------------------------------------------------------------------
 
+# For each package P marked as "dph" or "extra" in $(TOP)/packages:
+#   if $(TOP)/libraries/P exists, then
+#      if $(TOP)/libraries/P/ghc-packages exists, then
+#         * add each package from $(TOP)/libraries/P/ghc-packages2 to the list of
+#          packages.
+#           Note: ghc-packages2 might have a different list from
+#          ghc-packages, this is to support dph which has some
+#          packages that are automatically derived from a single
+#          source by the build system).
+#         * add $(TOP)/libraries/P to $(BUILD_DIRS)
+#           This step is necessary in the case of dph, which has some
+#           build system code in libraries/dph/ghc.mk, but
+#           libraries/dph is not itself a package.
+#      else
+#        add P to the list of packages
+
 define extra-packages
-$$(foreach p,$$(patsubst libraries/%,%,$$(wildcard $$(shell grep '^[^ ]\+ \+\(dph\|extra\) \+[^ ]\+ \+[^ ]\+ \+[^ ]\+' packages | sed 's/ .*//'))),\
-    $$(eval BUILD_DIRS += libraries/$$p)\
+$$(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))),\
         $$(eval $$(call extra-package,$$p,$$p)))\
 )
 endef
 
 define extra-package # $1 = package root, $2 = package
-ifeq "$(wildcard libraries/$1/ghc-stage2-package)" ""
+$(call trace, extra-package($1,$2))
+
+EXTRA_PACKAGES += $2
 $$(eval $$(call addPackage,$2))
-else
-$$(eval $$(call addPackage2,$2))
-endif
-endef
 
+endef