Skip to content

Fix bootstrap failing to copy rust-llvm-dwp when cross-compiling rustc #91270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fix bootstrap failing to copy rust-llvm-dwp when cross-compiling rustc #91270

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
320c47e
Fix bootstrap failing to copy rust-llvm-dwp when cross-compiling rustc
jam1garner Nov 26, 2021
5ac0662
Simplfy bootstrap rust-llvm-dwp copying
jam1garner Nov 26, 2021
282760a
Clean up bootstrap llvm-dwp path building
jam1garner Nov 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/bootstrap/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1161,9 +1161,16 @@ impl Step for Assemble {
let dst_exe = exe("rust-llvm-dwp", target_compiler.host);
let llvm_config_bin = builder.ensure(native::Llvm { target: target_compiler.host });
if !builder.config.dry_run {
let llvm_bin_dir = output(Command::new(llvm_config_bin).arg("--bindir"));
let llvm_bin_dir = Path::new(llvm_bin_dir.trim());
builder.copy(&llvm_bin_dir.join(&src_exe), &libdir_bin.join(&dst_exe));
if target_compiler.host == build_compiler.host {
let llvm_bin_dir = output(Command::new(llvm_config_bin).arg("--bindir"));
let llvm_bin_dir = Path::new(llvm_bin_dir.trim());
builder.copy(&llvm_bin_dir.join(&src_exe), &libdir_bin.join(&dst_exe));
} else {
// if cross-compiling don't copy the llvm directory for the target instead
let llvm_bin_dir = format!("build/{}/llvm/build/bin", target_compiler.host);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, would this work for the host too? It would be nice to do this unconditionally instead of making it different, people use download-ci-llvm a lot so this means it would get a lot more testing.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's better not to, as technically if not cross-compiling it's more correct to use llvm-config to have llvm get the path to itself (which, while better, isn't possible when the host and the target aren't the same)

let llvm_bin_dir = Path::new(&llvm_bin_dir);
builder.copy(&llvm_bin_dir.join(&src_exe), &libdir_bin.join(&dst_exe));
}
}
}

Expand Down