diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2022-07-30 16:53:18 -0400 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2022-08-19 09:04:47 -0400 |
| commit | 2769d6b9cc08038c2fe4ac657a7991a720f6f3c0 (patch) | |
| tree | c8d9aab2632bc34cb462ceb0c8633a54cbe631c4 /src/bootstrap | |
| parent | 6c943bad02626dddc5e5135b23c77429b6e4a063 (diff) | |
| download | rust-2769d6b9cc08038c2fe4ac657a7991a720f6f3c0.tar.gz rust-2769d6b9cc08038c2fe4ac657a7991a720f6f3c0.zip | |
Minor refactoring
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/config.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 203db2d3876..dc0fd2bdc65 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -993,7 +993,6 @@ impl Config { // This is currently all tier 1 targets and tier 2 targets with host tools // (since others may not have CI artifacts) // https://doc.rust-lang.org/rustc/platform-support.html#tier-1 - // FIXME: this is duplicated in bootstrap.py let supported_platforms = [ // tier 1 "aarch64-unknown-linux-gnu", @@ -1176,6 +1175,7 @@ impl Config { if config.llvm_from_ci { let triple = &config.build.triple; + let ci_llvm_bin = config.ci_llvm_root().join("bin"); let mut build_target = config .target_config .entry(config.build) @@ -1183,7 +1183,6 @@ impl Config { check_ci_llvm!(build_target.llvm_config); check_ci_llvm!(build_target.llvm_filecheck); - let ci_llvm_bin = config.out.join(&*config.build.triple).join("ci-llvm/bin"); build_target.llvm_config = Some(ci_llvm_bin.join(exe("llvm-config", config.build))); build_target.llvm_filecheck = Some(ci_llvm_bin.join(exe("FileCheck", config.build))); } |