diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-03-05 09:47:54 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-03-09 07:29:08 -0800 |
| commit | be902e7168505954b85e1bbb35322f8df8a29c19 (patch) | |
| tree | 1c68f40b0ae7d2c2b8a6e51064e18ab1dc601ca1 /src/bootstrap/check.rs | |
| parent | fedce67cd21dc08ece5a484fe1a060346acac98a (diff) | |
| download | rust-be902e7168505954b85e1bbb35322f8df8a29c19.tar.gz rust-be902e7168505954b85e1bbb35322f8df8a29c19.zip | |
rustbuild: Fix MSBuild location of `llvm-config.exe`
For LLD integration the path to `llvm-config` needed to change to inside the build directory itself (for whatever reason) but the build directory is different on MSBuild than it is on `ninja` for MSVC builds, so the path to `llvm-config.exe` was actually wrong and not working! This commit removes the `Build::llvm_config` function in favor of the source of truth, the `Llvm` build step itself. The build step was then updated to find the right build directory for MSBuild as well as `ninja` for where `llvm-config.exe` is located. Closes #48749
Diffstat (limited to 'src/bootstrap/check.rs')
| -rw-r--r-- | src/bootstrap/check.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs index 767ee4016c6..33bcfaa80ca 100644 --- a/src/bootstrap/check.rs +++ b/src/bootstrap/check.rs @@ -46,7 +46,7 @@ impl Step for Std { let out_dir = build.stage_out(compiler, Mode::Libstd); build.clear_if_dirty(&out_dir, &builder.rustc(compiler)); let mut cargo = builder.cargo(compiler, Mode::Libstd, target, "check"); - std_cargo(build, &compiler, target, &mut cargo); + std_cargo(builder, &compiler, target, &mut cargo); run_cargo(build, &mut cargo, &libstd_stamp(build, compiler, target), |