diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2021-07-01 05:20:59 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 05:20:59 +0900 |
| commit | e52a0ec5b8adedab4c72f005f39d283f8d32520b (patch) | |
| tree | 409b19b513073c41471842eb9ea9f85183db9283 | |
| parent | dfe05c0ea01f94e1701e8f1182b52b0f42682b3b (diff) | |
| parent | fe822fe64dacc7e73b0b7e0bf1306b3b652bcc0e (diff) | |
| download | rust-e52a0ec5b8adedab4c72f005f39d283f8d32520b.tar.gz rust-e52a0ec5b8adedab4c72f005f39d283f8d32520b.zip | |
Rollup merge of #86740 - 1000teslas:issue-71519-fix, r=petrochenkov
copy rust-lld as ld in dist Fixes bug in https://github.com/rust-lang/rust/pull/85961. Linking seems to work for pure Rust projects, but not when a C library needs to be dynamically linked.
| -rw-r--r-- | src/bootstrap/dist.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 19895baf08f..92853378e58 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -400,12 +400,12 @@ impl Step for Rustc { // Copy over lld if it's there if builder.config.lld_enabled { - let exe = exe("rust-lld", compiler.host); - builder.copy(&src_dir.join(&exe), &dst_dir.join(&exe)); + let rust_lld = exe("rust-lld", compiler.host); + builder.copy(&src_dir.join(&rust_lld), &dst_dir.join(&rust_lld)); // for `-Z gcc-ld=lld` let gcc_lld_dir = dst_dir.join("gcc-ld"); t!(fs::create_dir(&gcc_lld_dir)); - builder.copy(&src_dir.join(&exe), &gcc_lld_dir.join(&exe)); + builder.copy(&src_dir.join(&rust_lld), &gcc_lld_dir.join(exe("ld", compiler.host))); } // Copy over llvm-dwp if it's there |