From 0ad7468ff2f3727d0eac6fc6311cedf6c15db5c4 Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Tue, 29 Jun 2010 10:30:36 -0700 Subject: [PATCH] Revert "Improve makefile to try to avoid wedging on failure-to-dep lib/std.rc" This reverts commit 3bc263f10215e5768e9ff57ee1f1aa2bd81da5d1. --- src/Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Makefile b/src/Makefile index bb7a59d425c..5a72afdeea9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -631,17 +631,17 @@ test/run-fail/%.bc: test/run-fail/%.rs $(REQ) ML_DEPFILES := $(BOOT_MLS:%.ml=%.d) C_DEPFILES := $(RUNTIME_CS:%.cpp=%.d) -%.d.tmp: %.cpp $(MKFILES) +%.d: %.cpp $(MKFILES) @$(call CFG_ECHO, dep: $<) $(CFG_QUIET)$(call CFG_DEPEND_C, $@ \ $(patsubst %.cpp, %$(CFG_OBJ_SUFFIX), $<), \ $(RUNTIME_INCS)) $< $(CFG_PATH_MUNGE) >$@ -%.d.tmp: %.ml $(MKFILES) +%.d: %.ml $(MKFILES) @$(call CFG_ECHO, dep: $<) $(CFG_QUIET)ocamldep$(OPT) $(ML_INCS) $< $(CFG_PATH_MUNGE) >$@ -%.d.tmp: %.mli $(MKFILES) +%.d: %.mli $(MKFILES) @$(call CFG_ECHO, dep: $<) $(CFG_QUIET)ocamldep$(OPT) $(ML_INCS) $< $(CFG_PATH_MUNGE) >$@ @@ -656,21 +656,18 @@ CFG_INFO := $(info cfg: using built $(CFG_BOOT) for rust deps) STDLIB_DEPFILE := $(CFG_STDLIB).d CRATE_DEPFILES := $(ALL_TEST_CRATES:%.rc=%.d) $(STDLIB_DEPFILE) -$(STDLIB_DEPFILE).tmp: $(STDLIB_CRATE) $(MKFILES) $(CFG_BOOT) +$(STDLIB_DEPFILE): $(STDLIB_CRATE) $(MKFILES) $(CFG_BOOT) @$(call CFG_ECHO, dep: $<) $(BOOT) -shared -rdeps $< $(CFG_PATH_MUNGE) >$@ -%.d.tmp: %.rc $(MKFILES) $(CFG_BOOT) +%.d: %.rc $(MKFILES) $(CFG_BOOT) @$(call CFG_ECHO, dep: $<) $(BOOT) -rdeps $< $(CFG_PATH_MUNGE) >$@ -%.d.tmp: %.rs $(MKFILES) $(CFG_BOOT) +%.d: %.rs $(MKFILES) $(CFG_BOOT) @$(call CFG_ECHO, dep: $<) $(BOOT) -rdeps $< $(CFG_PATH_MUNGE) >$@ -%.d: %.d.tmp - $(CFG_QUIET)mv $< $@ - ifneq ($(MAKECMDGOALS),clean) -include $(CRATE_DEPFILES) endif