Move the PACKAGE_MAGIC evaluation inside package-data.mk

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

diff --git a/rules/build-dependencies.mk b/rules/build-dependencies.mk
index a862d41..f896b9f 100644 (file)
--- a/rules/build-dependencies.mk
+++ b/rules/build-dependencies.mk
@@ -22,9 +22,7 @@ $1_$2_depfile_c_asm = $$($1_$2_depfile_base).c_asm
 $1_$2_C_FILES_DEPS = $$(filter-out $$($1_$2_C_FILES_NODEPS),$$($1_$2_C_FILES))
 
 $1_$2_MKDEPENDHS_FLAGS = -dep-makefile $$($1_$2_depfile_haskell).tmp $$(foreach way,$$(filter-out v,$$($1_$2_WAYS)),-dep-suffix $$(way))
-ifneq "$3" "0"
 $1_$2_MKDEPENDHS_FLAGS += -include-pkg-deps
-endif
 
 ifneq "$$($1_$2_NO_BUILD_DEPS)" "YES"
 
@@ -42,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)