X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-dependencies.mk;h=f223288ea7c6f6a0a218323fe6c14e21e5b47270;hb=75d9236613acdcfa54deb81b12bd4546c31e7c9f;hp=8f52bc50587102157c7396fef36851cc32a106ee;hpb=68b77366cbb16ff237320cca7260909050c41a50;p=ghc-hetmet.git

diff --git a/rules/build-dependencies.mk b/rules/build-dependencies.mk
index 8f52bc5..f223288 100644
--- a/rules/build-dependencies.mk
+++ b/rules/build-dependencies.mk
@@ -10,17 +10,20 @@
 #
 # -----------------------------------------------------------------------------
 
-define build-dependencies # args: $1 = dir, $2 = distdir
+define build-dependencies
+$(call trace, build-dependencies($1,$2,$3))
+# $1 = dir
+# $2 = distdir
+# $3 = GHC stage to use (0 == bootstrapping compiler)
 
 $1_$2_depfile_haskell = $$($1_$2_depfile_base).haskell
 $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))
 
-ifeq "$$($1_$2_ghc_ge_609)" "YES"
-$1_$2_MKDEPENDHS_FLAGS = -include-pkg-deps -dep-makefile $$($1_$2_depfile_haskell).tmp $$(foreach way,$$(filter-out v,$$($1_$2_WAYS)),-dep-suffix $$(way))
-else
-$1_$2_MKDEPENDHS_FLAGS = -optdep--include-pkg-deps -optdep-f -optdep$$($1_$2_depfile_haskell).tmp $$(foreach way,$$(filter-out v,$$($1_$2_WAYS)),-optdep-s -optdep$$(way))
+$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"
@@ -65,7 +68,11 @@ endif # $1_$2_NO_BUILD_DEPS
 $$($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"
@@ -87,6 +94,12 @@ endef
 # The formatting of this definition (e.g. the blank line above) is
 # important, in order to get make to generate the right makefile code.
 #
+# 's|\\|/|g'
+#    We first normalise all slashes to be forward slashes. Note that
+#    $(TOP) also uses forward slashes.
+# 's| /$$| \\|'
+#    But now we need to fix the line continuation characters that we
+#    just broke.
 # "1s|\.o|\.$($w_osuf)|"
 #    We will have dependencies for .o files, so we need to fix them up
 #    for the right object suffix for the way we're doing
@@ -101,15 +114,31 @@ endef
 #    "dist/build" directory, so now we've just made
 #    "dist/build/dist/build", so we need to remove the duplication
 #    again
-# "s|$(TOP)/||gi"
-#    Finally, cpp -MM will give us full paths for some files, but this
-#    causes problems on Windows where make interprets the colon in
-#    c:/foo/bar.h as make syntax. So we sed off $(TOP) (case
-#    insensitively, as sometimes you get C:/... when you are expecting
-#    c:/... or vice versa)
+# "s|$(TOP)/||g$(CASE_INSENSITIVE_SED)"
+#    Finally, when making deps for packages like ghc stage2, we have
+#    some include paths for packages registered in the in-tree package
+#    database. These include paths are full (i.e. not relative) paths,
+#    which means that the "cpp -MM" output uses full paths in some cases.
+#    This causes 2 problems:
+#    * they don't match up with the rules to rebuild the files, where
+#      appropriate.
+#    * on Windows, make interprets the colon in c:/foo/bar.h as make
+#      syntax.
+#    So we sed off $(TOP). Unfortunately, on Windows, the case for the
+#    drive letter is sometimes different in what $(TOP) starts with, and
+#    what the path in the package database starts with. We therefore
+#	 need to do the substitution case-insensitively on Windows. But
+#    the s///i modifier isn't portable, so we set CASE_INSENSITIVE_SED
+#    to "i" on Windows and "" on any other platform.
 define addCFileDeps
 
 	$(CPP) $($1_$2_MKDEPENDC_OPTS) $($1_$2_v_ALL_CC_OPTS) $($(basename $4)_CC_OPTS) -MM $4 -MF $3.bit
-	$(foreach w,$5,sed -e "1s|\.o|\.$($w_osuf)|" -e "1s|^|$(dir $4)|" -e "1s|$1/|$1/$2/build/|" -e "1s|$2/build/$2/build|$2/build|g" -e "s|$(TOP)/||gi" $3.bit >> $3.tmp &&) true
+	$(foreach w,$5,sed -e 's|\\|/|g' -e 's| /$$| \\|' -e "1s|\.o|\.$($w_osuf)|" -e "1s|^|$(dir $4)|" -e "1s|$1/|$1/$2/build/|" -e "1s|$2/build/$2/build|$2/build|g" -e "s|$(TOP)/||g$(CASE_INSENSITIVE_SED)" $3.bit >> $3.tmp &&) true
 endef
 
+ifeq "$(Windows)" "YES"
+CASE_INSENSITIVE_SED = i
+else
+CASE_INSENSITIVE_SED =
+endif
+