diff options
| author | Hans Kratz <hans@appfour.com> | 2021-08-23 09:28:07 +0200 |
|---|---|---|
| committer | Hans Kratz <hans@appfour.com> | 2021-08-23 09:28:07 +0200 |
| commit | a5190950546c1d62b5a1b476daae3a28f412df05 (patch) | |
| tree | 9aa4d82b79472aafdceabffbdcd15de027c97366 | |
| parent | 0ac601d03e0e0951f73d6a89cb6a5aef1905e29b (diff) | |
| download | rust-a5190950546c1d62b5a1b476daae3a28f412df05.tar.gz rust-a5190950546c1d62b5a1b476daae3a28f412df05.zip | |
Include ld64 nexte to ld for use with -Z gcc-ld
| -rw-r--r-- | src/bootstrap/compile.rs | 4 | ||||
| -rw-r--r-- | src/bootstrap/dist.rs | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index d2598995478..2a6a05e8e50 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -1121,6 +1121,10 @@ impl Step for Assemble { &lld_install.join("bin").join(&src_exe), &gcc_ld_dir.join(exe("ld", target_compiler.host)), ); + builder.copy( + &lld_install.join("bin").join(&src_exe), + &gcc_ld_dir.join(exe("ld64", target_compiler.host)), + ); } // Similarly, copy `llvm-dwp` into libdir for Split DWARF. Only copy it when the LLVM diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 64075e18366..d0bcdb179e3 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -412,6 +412,8 @@ impl Step for Rustc { let gcc_lld_dir = dst_dir.join("gcc-ld"); t!(fs::create_dir(&gcc_lld_dir)); builder.copy(&src_dir.join(&rust_lld), &gcc_lld_dir.join(exe("ld", compiler.host))); + builder + .copy(&src_dir.join(&rust_lld), &gcc_lld_dir.join(exe("ld64", compiler.host))); } // Copy over llvm-dwp if it's there |