about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-12-02 11:35:57 +0000
committerbors <bors@rust-lang.org>2016-12-02 11:35:57 +0000
commit2f8fd533ac8391fa848c3a637ca05fd60993f79e (patch)
tree4d40aa72ce54c945584410802bdca831f441c775
parentaf0a0719ead0dc1c2787128f7290b57b8848c88b (diff)
parent75069909143eb777f7def21888f9677eb8935cf8 (diff)
downloadrust-2f8fd533ac8391fa848c3a637ca05fd60993f79e.tar.gz
rust-2f8fd533ac8391fa848c3a637ca05fd60993f79e.zip
Auto merge of #38050 - alexcrichton:fix-llvm-deps, r=japaric
rustbuild: Cross-compiled LLVM depens on host

We use the host's tblgen so we need to be sure to always build the host first.

Closes #38037
-rw-r--r--src/bootstrap/step.rs7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/bootstrap/step.rs b/src/bootstrap/step.rs
index 4c1f58e52d9..b8683831af1 100644
--- a/src/bootstrap/step.rs
+++ b/src/bootstrap/step.rs
@@ -98,6 +98,13 @@ pub fn build_rules(build: &Build) -> Rules {
          .run(move |s| compile::assemble_rustc(build, s.stage, s.target));
     rules.build("llvm", "src/llvm")
          .host(true)
+         .dep(move |s| {
+             if s.target == build.config.build {
+                 dummy(s, build)
+             } else {
+                 s.target(&build.config.build)
+             }
+         })
          .run(move |s| native::llvm(build, s.target));
 
     // ========================================================================