Skip to content

Commit a519095

Browse files
committed
Include ld64 nexte to ld for use with -Z gcc-ld
1 parent 0ac601d commit a519095

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

src/bootstrap/compile.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1121,6 +1121,10 @@ impl Step for Assemble {
11211121
&lld_install.join("bin").join(&src_exe),
11221122
&gcc_ld_dir.join(exe("ld", target_compiler.host)),
11231123
);
1124+
builder.copy(
1125+
&lld_install.join("bin").join(&src_exe),
1126+
&gcc_ld_dir.join(exe("ld64", target_compiler.host)),
1127+
);
11241128
}
11251129

11261130
// Similarly, copy `llvm-dwp` into libdir for Split DWARF. Only copy it when the LLVM

src/bootstrap/dist.rs

+2
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,8 @@ impl Step for Rustc {
412412
let gcc_lld_dir = dst_dir.join("gcc-ld");
413413
t!(fs::create_dir(&gcc_lld_dir));
414414
builder.copy(&src_dir.join(&rust_lld), &gcc_lld_dir.join(exe("ld", compiler.host)));
415+
builder
416+
.copy(&src_dir.join(&rust_lld), &gcc_lld_dir.join(exe("ld64", compiler.host)));
415417
}
416418

417419
// Copy over llvm-dwp if it's there

0 commit comments

Comments
 (0)