X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rules%2Fbuild-dependencies.mk;h=962c0408ab094028f0e9411a3edf75eef5069aa8;hp=962f07b3dfcfe83783ecee43ebc6844b14d5e643;hb=dc5b9bd64d1c1f544e4813dc946b5a83ad304cee;hpb=0ef6ba7b28187a4bf5309f9702eeaf53a281204b

diff --git a/rules/build-dependencies.mk b/rules/build-dependencies.mk
index 962f07b..962c040 100644
--- a/rules/build-dependencies.mk
+++ b/rules/build-dependencies.mk
@@ -10,36 +10,51 @@
 #
 # -----------------------------------------------------------------------------
 
-
 define build-dependencies # args: $1 = dir, $2 = distdir
 
+$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) $$(foreach way,$$(filter-out v,$$($1_$2_WAYS)),-dep-suffix $$(way))
+$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) $$(foreach way,$$(filter-out v,$$($1_$2_WAYS)),-optdep-s -optdep$$(way))
+$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))
 endif
 
 ifneq "$$($1_$2_NO_BUILD_DEPS)" "YES"
 
-$$($1_$2_depfile) : $$(MKDIRHIER) $$(MKDEPENDC) $$($1_$2_HS_SRCS) $$($1_$2_HS_BOOT_SRCS) $$($1_$2_HC_MK_DEPEND_DEP) $$($1_$2_C_FILES) $$($1_$2_S_FILES)
-	"$$(MKDIRHIER)" $1/$2/build
-	"$$(RM)" $$(RM_OPTS) $$@ $$@.tmp
+$$($1_$2_depfile_haskell) : $$($1_$2_HS_SRCS) $$($1_$2_HS_BOOT_SRCS) $$($1_$2_HC_MK_DEPEND_DEP) | $$$$(dir $$$$@)/.
+	"$$(RM)" $$(RM_OPTS) $$@.tmp
 	touch $$@.tmp
-ifneq "$$($1_$2_C_SRCS)$$($1_$2_S_SRCS)" ""
-	"$$(MKDEPENDC)" -f $$($1_$2_depfile).tmp $$($1_MKDEPENDC_OPTS) $$(foreach way,$$($1_WAYS),-s $$(way)) -- $$($1_$2_v_ALL_CC_OPTS) -- $$($1_$2_C_FILES) $$($1_$2_S_FILES) || ( "$$(RM)" $$(RM_OPTS) $$@; exit 1 )
-	sed -e "s|$1/\([^ :]*o[ :]\)|$1/$2/build/\1|g" -e "s|$$(TOP)/||" <$$($1_$2_depfile).tmp >$$($1_$2_depfile)
-endif
 ifneq "$$($1_$2_HS_SRCS)" ""
 	"$$($1_$2_HC_MK_DEPEND)" -M $$($1_$2_MKDEPENDHS_FLAGS) \
 	    $$(filter-out -split-objs, $$($1_$2_v_ALL_HC_OPTS)) \
-	    $$($1_$2_HS_SRCS) || ( "$$(RM)" $$(RM_OPTS) $$@; exit 1 )
+	    $$($1_$2_HS_SRCS)
 endif
-	echo "$1_$2_depfile_EXISTS = YES" >> $$@
+	echo "$1_$2_depfile_haskell_EXISTS = YES" >> $$@.tmp
 ifneq "$$($1_$2_SLASH_MODS)" ""
 	for dir in $$(sort $$(foreach mod,$$($1_$2_SLASH_MODS),$1/$2/build/$$(dir $$(mod)))); do \
 		if test ! -d $$$$dir; then mkdir -p $$$$dir; fi \
 	done
 endif
+	mv $$@.tmp $$@
+
+$$($1_$2_depfile_c_asm) : $$($1_$2_C_FILES_DEPS) $$($1_$2_S_FILES) | $$$$(dir $$$$@)/.
+	"$$(RM)" $$(RM_OPTS) $$@.tmp
+	touch $$@.tmp
+ifneq "$$(strip $$($1_$2_C_FILES_DEPS)$$($1_$2_S_FILES))" ""
+# We ought to actually do this for each way in $$($1_$2_WAYS), but then
+# it takes a long time to make the C deps for the RTS (30 seconds rather
+# than 3), so instead we just pass the list of ways in and let addCFileDeps
+# copy the deps for each way on the assumption that they are the same
+	$$(foreach f,$$($1_$2_C_FILES_DEPS) $$($1_$2_S_FILES), \
+	    $$(call addCFileDeps,$1,$2,$$($1_$2_depfile_c_asm),$$f,$$($1_$2_WAYS)))
+	"$$(RM)" $$(RM_OPTS) $$@.bit
+endif
+	echo "$1_$2_depfile_c_asm_EXISTS = YES" >> $$@.tmp
+	mv $$@.tmp $$@
 
 endif # $1_$2_NO_BUILD_DEPS
 
@@ -47,10 +62,11 @@ endif # $1_$2_NO_BUILD_DEPS
 # 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) : $$(UNLIT)
+$$($1_$2_depfile_haskell) : $$(UNLIT)
 
 ifneq "$$(NO_INCLUDE_DEPS)" "YES"
-include $$($1_$2_depfile)
+include $$($1_$2_depfile_haskell)
+include $$($1_$2_depfile_c_asm)
 else
 ifeq "$$(DEBUG)" "YES"
 $$(warning not building dependencies in $1)
@@ -58,3 +74,58 @@ endif
 endif
 
 endef
+
+# This comment is outside the "define addCFileDeps" as that definition
+# is a list of command lines, and if it is inside it then we pass this
+# comment to the shell every time we call the definition.
+# $1 = dir
+# $2 = distdir
+# $3 = depfile
+# $4 = file
+# $5 = ways
+#
+# The formatting of this definition (e.g. the blank line above) is
+# important, in order to get make to generate the right makefile code.
+#
+# "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
+# "1s|^|$(dir $4)|"
+#    We always get deps for just foo.o when the file we're making is
+#    a/b/c/foo.o, so we need to prepend the directory of the source file
+# "1s|$1/|$1/$2/build/|"
+#    Well, almost. We actually need to insert e.g. "dist/build" in the
+#    middle of that directory
+# "1s|$2/build/$2/build|$2/build|g"
+#    But some source files, e.g. sm/Evac_thr.c, are also inside the
+#    "dist/build" directory, so now we've just made
+#    "dist/build/dist/build", so we need to remove the duplication
+#    again
+# "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)/||g$(CASE_INSENSITIVE_SED)" $3.bit >> $3.tmp &&) true
+endef
+
+ifeq "$(Windows)" "YES"
+CASE_INSENSITIVE_SED = i
+else
+CASE_INSENSITIVE_SED =
+endif
+