Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/fe05c0224ec00ff71742e62674a47f346cd1b3e3 >--------------------------------------------------------------- commit fe05c0224ec00ff71742e62674a47f346cd1b3e3 Author: Ian Lynagh <[email protected]> Date: Sat Dec 3 00:34:30 2011 +0000 Remove some unnecessary touch's They made a dependency cycle in the rules used to build the touch program on Windows. >--------------------------------------------------------------- rules/build-dependencies.mk | 6 ++---- rules/build-prog.mk | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/rules/build-dependencies.mk b/rules/build-dependencies.mk index 6ab2edc..a37ff16 100644 --- a/rules/build-dependencies.mk +++ b/rules/build-dependencies.mk @@ -31,9 +31,8 @@ ifneq "$$(NO_GENERATED_MAKEFILE_RULES)" "YES" # indirectly) include the generated includes files. $$($1_$2_depfile_haskell) : $$(includes_H_CONFIG) $$(includes_H_PLATFORM) -$$($1_$2_depfile_haskell) : $$($1_$2_HS_SRCS) $$($1_$2_HS_BOOT_SRCS) $$($1_$2_HC_MK_DEPEND_DEP) $$(TOUCH_DEP) | $$$$(dir $$$$@)/. +$$($1_$2_depfile_haskell) : $$($1_$2_HS_SRCS) $$($1_$2_HS_BOOT_SRCS) $$($1_$2_HC_MK_DEPEND_DEP) | $$$$(dir $$$$@)/. $$(call removeFiles,[email protected]) - "$$(TOUCH_CMD)" [email protected] 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)) \ @@ -54,9 +53,8 @@ endif # includes files. $$($1_$2_depfile_c_asm) : $$(includes_H_CONFIG) $$(includes_H_PLATFORM) -$$($1_$2_depfile_c_asm) : $$($1_$2_C_FILES_DEPS) $$($1_$2_S_FILES) $$(TOUCH_DEP) | $$$$(dir $$$$@)/. +$$($1_$2_depfile_c_asm) : $$($1_$2_C_FILES_DEPS) $$($1_$2_S_FILES) | $$$$(dir $$$$@)/. $$(call removeFiles,[email protected]) - "$$(TOUCH_CMD)" [email protected] 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 diff --git a/rules/build-prog.mk b/rules/build-prog.mk index aa66516..69c5bd5 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -94,9 +94,8 @@ $(call all-target,$1_$2,$1/$2/build/tmp/$$($1_$2_PROG)) # INPLACE_BIN might be empty if we're distcleaning ifeq "$(findstring clean,$(MAKECMDGOALS))" "" ifneq "$$($1_$2_INSTALL_INPLACE)" "NO" -$$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG) $$(TOUCH_DEP) | $$$$(dir $$$$@)/. +$$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG) | $$$$(dir $$$$@)/. "$$(CP)" -p $$< $$@ - "$$(TOUCH_CMD)" $$@ endif endif _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
