Skip to content

Commit f841b26

Browse files
author
Kjetil Kjeka
committed
Bootstrap: Install llvm-bitcode-linker into self-contained dir
1 parent ceab612 commit f841b26

File tree

1 file changed

+5
-3
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+5
-3
lines changed

src/bootstrap/src/core/build_steps/tool.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -746,9 +746,11 @@ impl Step for LlvmBitcodeLinker {
746746
.join(exe(bin_name, self.compiler.host));
747747

748748
if self.compiler.stage > 0 {
749-
let bindir = builder.sysroot(self.compiler).join("bin");
750-
t!(fs::create_dir_all(&bindir));
751-
let bin_destination = bindir.join(exe(bin_name, self.compiler.host));
749+
let bindir_self_contained = builder
750+
.sysroot(self.compiler)
751+
.join(format!("lib/rustlib/{}/bin/self-contained", self.target.triple));
752+
t!(fs::create_dir_all(&bindir_self_contained));
753+
let bin_destination = bindir_self_contained.join(exe(bin_name, self.compiler.host));
752754
builder.copy_link(&tool_out, &bin_destination);
753755
bin_destination
754756
} else {

0 commit comments

Comments
 (0)