projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a54c59a
)
Fix cross-package dependency generation on Windows
author
Ian Lynagh
<igloo@earth.li>
Sun, 16 Jan 2011 15:09:01 +0000
(15:09 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Sun, 16 Jan 2011 15:09:01 +0000
(15:09 +0000)
rules/build-dependencies.mk
patch
|
blob
|
history
diff --git
a/rules/build-dependencies.mk
b/rules/build-dependencies.mk
index
5cc91dc
..
f896b9f
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
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)
# Some of the C files depend on the generated includes files.
$$($1_$2_depfile_c_asm) : $$(includes_H_CONFIG) $$(includes_H_PLATFORM)