Tweak some deps to avoid multiple $(wildcard ...)s

[ghc-hetmet.git] / rules / build-dependencies.mk

diff --git a/rules/build-dependencies.mk b/rules/build-dependencies.mk
index 5cc91dc..6d19416 100644 (file)
--- a/rules/build-dependencies.mk
+++ b/rules/build-dependencies.mk
@@ -40,7 +40,10 @@ ifneq "$$($1_$2_SLASH_MODS)" ""
                if test ! -d $$$$dir; then mkdir -p $$$$dir; fi \
        done
 endif
-       mv $$@.tmp $$@
+#    Some packages are from the bootstrapping compiler, so are not
+#    within the build tree. On Windows this causes a problem as they look
+#    like bad rules, due to the two colons, so we filter them out.
+       grep -v ' : [a-zA-Z]:/' $$@.tmp > $$@
 
 # Some of the C files depend on the generated includes files.
 $$($1_$2_depfile_c_asm) : $$(includes_H_CONFIG) $$(includes_H_PLATFORM)
@@ -65,22 +68,6 @@ endif # $1_$2_NO_BUILD_DEPS
 # Note sed magic above: mkdependC can't do -odir stuff, so we have to
 # munge the dependencies it generates to refer to the correct targets.
 
-# Seems as good a place as any to attach the unlit dependency
-$$($1_$2_depfile_haskell) : $$(UNLIT)
-
-ifneq "$$(NO_INCLUDE_DEPS)" "YES"
-ifneq "$$(strip $$($1_$2_HS_SRCS) $$($1_$2_HS_BOOT_SRCS))" ""
-ifneq "$$(NO_STAGE$3_DEPS)" "YES"
-include $$($1_$2_depfile_haskell)
-endif
-endif
-include $$($1_$2_depfile_c_asm)
-else
-ifeq "$$(DEBUG)" "YES"
-$$(warning not building dependencies in $1)
-endif
-endif
-
 endef
 
 # This comment is outside the "define addCFileDeps" as that definition