diff options
| author | bors <bors@rust-lang.org> | 2015-11-14 04:14:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-11-14 04:14:22 +0000 |
| commit | 32202cca2783397d9556371c851c48c6bca35ed1 (patch) | |
| tree | 42038b2b5c713bce101f1befd6454bb20763ed37 | |
| parent | b6b17c989964291e89c19fbdfc0ada2df3eaf64a (diff) | |
| parent | 8d105dd852773ea9c5c7f16db181a0a5fded414d (diff) | |
| download | rust-32202cca2783397d9556371c851c48c6bca35ed1.tar.gz rust-32202cca2783397d9556371c851c48c6bca35ed1.zip | |
Auto merge of #29820 - wthrowe:makefile-fixes, r=brson
The first commit fixes the "jobserver unavailable" warning reported at gentoo/gentoo-rust#29. I don't think the warning is related to the compilation failure shown there. The remaining commits are minor fixes I noticed while investigating the jobserver warning.
| -rw-r--r-- | mk/llvm.mk | 6 | ||||
| -rw-r--r-- | mk/snap.mk | 4 | ||||
| -rw-r--r-- | mk/target.mk | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mk/llvm.mk b/mk/llvm.mk index 1cbf4a9fb84..b2a90f583f7 100644 --- a/mk/llvm.mk +++ b/mk/llvm.mk @@ -64,10 +64,10 @@ $$(LLVM_AR_$(1)): $$(LLVM_CONFIG_$(1)) # when we changed something not otherwise captured by builtin # dependencies. In these cases, commit a change that touches # the stamp in the source dir. -$$(LLVM_STAMP_$(1)): $(S)src/rustllvm/llvm-auto-clean-trigger +$$(LLVM_STAMP_$(1)): $$(S)src/rustllvm/llvm-auto-clean-trigger @$$(call E, make: cleaning llvm) - $(Q)touch $$@.start_time - $(Q)$(MAKE) clean-llvm$(1) + $$(Q)touch $$@.start_time + $$(Q)$$(MAKE) clean-llvm$(1) @$$(call E, make: done cleaning llvm) touch -r $$@.start_time $$@ && rm $$@.start_time diff --git a/mk/snap.mk b/mk/snap.mk index 86c89cf0210..0b34f52b7eb 100644 --- a/mk/snap.mk +++ b/mk/snap.mk @@ -18,8 +18,8 @@ snap-stage$(1)-H-$(2): $$(HSREQ$(1)_H_$(2)) endef $(foreach host,$(CFG_HOST), \ - $(eval $(foreach stage,1 2 3, \ - $(eval $(call DEF_SNAP_FOR_STAGE_H,$(stage),$(host)))))) + $(foreach stage,1 2 3, \ + $(eval $(call DEF_SNAP_FOR_STAGE_H,$(stage),$(host))))) snap-stage1: snap-stage1-H-$(CFG_BUILD) diff --git a/mk/target.mk b/mk/target.mk index da52b2f4d5e..ae9fd9d1ada 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -204,5 +204,5 @@ $(foreach host,$(CFG_HOST), \ $(foreach host,$(CFG_HOST), \ $(foreach target,$(CFG_TARGET), \ $(foreach stage,$(STAGES), \ - $(foreach obj,rsbegin rsend, \ - $(eval $(call TARGET_RUSTRT_STARTUP_OBJ,$(stage),$(target),$(host),$(obj))))))) + $(foreach obj,rsbegin rsend, \ + $(eval $(call TARGET_RUSTRT_STARTUP_OBJ,$(stage),$(target),$(host),$(obj))))))) |