diff options
| author | Graydon Hoare <[email protected]> | 2010-09-22 14:47:31 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2010-09-22 15:27:24 -0700 |
| commit | 913882de7f36e12e5b09b52b5c6b225defaf6ef0 (patch) | |
| tree | f92391beb0f0c1f1cfecbda80a4264b6febc2d62 | |
| parent | Revert "Make recursive type verification logic better by allowing it to see t... (diff) | |
| download | rust-913882de7f36e12e5b09b52b5c6b225defaf6ef0.tar.xz rust-913882de7f36e12e5b09b52b5c6b225defaf6ef0.zip | |
Make deps via temps, to avoid syntax errors wedging deps.
| -rw-r--r-- | src/Makefile | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile index 8277ed31..e6c559aa 100644 --- a/src/Makefile +++ b/src/Makefile @@ -830,15 +830,18 @@ C_DEPFILES := $(RUNTIME_CS:%.cpp=%.d) @$(call CFG_ECHO, dep: $<) $(CFG_QUIET)$(call CFG_DEPEND_C, $@ \ $(patsubst %.cpp, %$(CFG_OBJ_SUFFIX), $<), \ - $(RUNTIME_INCS)) $< $(CFG_PATH_MUNGE) >$@ + $(RUNTIME_INCS)) $< $(CFG_PATH_MUNGE) >[email protected] \ + && mv [email protected] $@ %.d: %.ml $(MKFILES) @$(call CFG_ECHO, dep: $<) - $(CFG_QUIET)ocamldep$(OPT) $(ML_DEP_INCS) $< $(CFG_PATH_MUNGE) >$@ + $(CFG_QUIET)ocamldep$(OPT) $(ML_DEP_INCS) $< $(CFG_PATH_MUNGE) >[email protected] \ + && mv [email protected] $@ %.d: %.mli $(MKFILES) @$(call CFG_ECHO, dep: $<) - $(CFG_QUIET)ocamldep$(OPT) $(ML_DEP_INCS) $< $(CFG_PATH_MUNGE) >$@ + $(CFG_QUIET)ocamldep$(OPT) $(ML_DEP_INCS) $< $(CFG_PATH_MUNGE) >[email protected] \ + && mv [email protected] $@ ifneq ($(MAKECMDGOALS),clean) -include $(ML_DEPFILES) $(C_DEPFILES) @@ -853,15 +856,18 @@ CRATE_DEPFILES := $(ALL_TEST_CRATES:%.rc=%.d) $(STDLIB_DEPFILE) $(STDLIB_DEPFILE): $(STDLIB_CRATE) $(MKFILES) $(CFG_BOOT) @$(call CFG_ECHO, dep: $<) - $(BOOT) -shared -rdeps $< $(CFG_PATH_MUNGE) >$@ + $(BOOT) -shared -rdeps $< $(CFG_PATH_MUNGE) >[email protected] \ + && mv [email protected] $@ %.d: %.rc $(MKFILES) $(CFG_BOOT) @$(call CFG_ECHO, dep: $<) - $(BOOT) -rdeps $< $(CFG_PATH_MUNGE) >$@ + $(BOOT) -rdeps $< $(CFG_PATH_MUNGE) >[email protected] \ + && mv [email protected] $@ %.d: %.rs $(MKFILES) $(CFG_BOOT) @$(call CFG_ECHO, dep: $<) - $(BOOT) -rdeps $< $(CFG_PATH_MUNGE) >$@ + $(BOOT) -rdeps $< $(CFG_PATH_MUNGE) >[email protected] \ + && mv [email protected] $@ ifneq ($(MAKECMDGOALS),clean) -include $(CRATE_DEPFILES) @@ -937,6 +943,9 @@ clean: $(CFG_QUIET)rm -f $(BOOT_CMOS) $(BOOT_CMIS) $(BOOT_CMXS) $(BOOT_OBJS) $(CFG_QUIET)rm -f $(CFG_COMPILER) $(CFG_QUIET)rm -f $(ML_DEPFILES) $(C_DEPFILES) $(CRATE_DEPFILES) + $(CFG_QUIET)rm -f $(ML_DEPFILES:%.d=%.d.tmp) + $(CFG_QUIET)rm -f $(C_DEPFILES:%.d=%.d.tmp) + $(CFG_QUIET)rm -f $(CRATE_DEPFILES:%.d=%.d.tmp) $(CFG_QUIET)rm -f $(GENERATED) $(CFG_QUIET)rm -f $(CFG_BOOT) $(CFG_RUNTIME) $(CFG_STDLIB) $(CFG_QUIET)rm -f $(TEST_RPASS_EXES_X86) $(TEST_RPASS_OUTS_X86) \ |