diff options
| author | bors <bors@rust-lang.org> | 2014-01-04 05:11:53 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-04 05:11:53 -0800 |
| commit | 48dc2cbf2344d1237dd3e10ad274a5ded3e93677 (patch) | |
| tree | cec9dc9ab0b496971acc5e4430292d9b7c849d6f | |
| parent | 690e464444eb2330cdcea66eb5d1bc68c652c3db (diff) | |
| parent | b3a334af6a897475860c3b60ab2045b7a7abe0f0 (diff) | |
| download | rust-48dc2cbf2344d1237dd3e10ad274a5ded3e93677.tar.gz rust-48dc2cbf2344d1237dd3e10ad274a5ded3e93677.zip | |
auto merge of #11292 : brson/rust/llvmconfig, r=alexcrichton
In a multi-host build the mklldeps.py tool is getting called before all the llvm-configs are built. I am not actually sure the cause. I had convinced myself that DEF_LLVM_RULES needed to be called before the llvmdeps.rs rule, but now looking at it again I can't see why. Here's the error: http://buildbot.rust-lang.org/builders/dist2-linux/builds/11/steps/compile/logs/stdio r? @alexcrichton
| -rw-r--r-- | mk/llvm.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/llvm.mk b/mk/llvm.mk index c85a4687613..f8d0c624de5 100644 --- a/mk/llvm.mk +++ b/mk/llvm.mk @@ -47,11 +47,11 @@ endef $(foreach host,$(CFG_HOST), \ $(eval LLVM_CONFIGS := $(LLVM_CONFIGS) $(LLVM_CONFIG_$(host)))) +$(foreach host,$(CFG_HOST), \ + $(eval $(call DEF_LLVM_RULES,$(host)))) + $(S)src/librustc/lib/llvmdeps.rs: \ $(LLVM_CONFIGS) \ $(S)src/etc/mklldeps.py $(Q)$(CFG_PYTHON) $(S)src/etc/mklldeps.py \ "$@" "$(LLVM_COMPONENTS)" $(LLVM_CONFIGS) - -$(foreach host,$(CFG_HOST), \ - $(eval $(call DEF_LLVM_RULES,$(host)))) |