about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2016-11-28 07:13:47 -0800
committerAlex Crichton <alex@alexcrichton.com>2016-11-28 07:13:47 -0800
commit75069909143eb777f7def21888f9677eb8935cf8 (patch)
treee01c4b97658605b0333b3c0a2e7bf6d87375b74b /src
parent0b399e5e99a44cf44d3860d353a8b7619d466410 (diff)
downloadrust-75069909143eb777f7def21888f9677eb8935cf8.tar.gz
rust-75069909143eb777f7def21888f9677eb8935cf8.zip
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
Diffstat (limited to 'src')
-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));
 
     // ========================================================================