X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-dependencies.mk;h=6d194165fe5c33c9669169437c84ceb4ae1910c4;hb=032dd778604f80378823af026a99850141ad6cd3;hp=a862d41a244657b7aa66e4d7e66da0d94b49ad2e;hpb=f9076f8091c9b88287418f76c01a32149df0fc71;p=ghc-hetmet.git

diff --git a/rules/build-dependencies.mk b/rules/build-dependencies.mk
index a862d41..6d19416 100644
--- 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)
@@ -67,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