From 876c33051a54e03fcd054408b87cf8ca0550f115 Mon Sep 17 00:00:00 2001 From: William Throwe Date: Fri, 13 Nov 2015 14:54:25 -0500 Subject: [PATCH 1/3] Escape some variables in llvm.mk The important one is $(MAKE). make handles recipes containing the literal string "$(MAKE)" specially, so it is important to make sure it isn't evaluated until recipe invocation time. --- mk/llvm.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/llvm.mk b/mk/llvm.mk index 1cbf4a9fb841c..b2a90f583f7b2 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 From a0e10b249e0ab0429fc6f733e7e3cd94e587b686 Mon Sep 17 00:00:00 2001 From: William Throwe Date: Fri, 13 Nov 2015 15:01:07 -0500 Subject: [PATCH 2/3] Clean up some "suspicious" whitespace in target.mk Emacs warns that makefile lines that start with spaces followed by tabs are "suspicious". These were harmless since they were continuation lines, but getting rid of the warning is nice and this version looks better. --- mk/target.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/target.mk b/mk/target.mk index da52b2f4d5e5b..ae9fd9d1adacf 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))))))) From 8d105dd852773ea9c5c7f16db181a0a5fded414d Mon Sep 17 00:00:00 2001 From: William Throwe Date: Fri, 13 Nov 2015 15:13:05 -0500 Subject: [PATCH 3/3] Remove extra eval call in snap.mk --- mk/snap.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/snap.mk b/mk/snap.mk index 86c89cf0210ee..0b34f52b7ebbe 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)