]> git.lizzy.rs Git - rust.git/commitdiff
Escape some variables in llvm.mk
authorWilliam Throwe <wtt6@cornell.edu>
Fri, 13 Nov 2015 19:54:25 +0000 (14:54 -0500)
committerWilliam Throwe <wtt6@cornell.edu>
Fri, 13 Nov 2015 20:15:51 +0000 (15:15 -0500)
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

index 1cbf4a9fb841c26db01d99472f25fe9fd931f938..b2a90f583f7b2bf445cd823095a7ca0f4e947454 100644 (file)
@@ -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