nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 00:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lld detection if stage0 rustc built with custom libdir

Browse Source
This commit is contained in:
O01eg 2020-05-29 16:50:03 +03:00
parent 4512721156
commit ce722999ea
No known key found for this signature in database
GPG Key ID: 10C46A3A6E632832
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bootstrap/lib.rs
View File

@ -344,13 +344,19 @@ impl Build {
// we always try to use git for LLVM builds
let in_tree_llvm_info = channel::GitInfo::new(false, &src.join("src/llvm-project"));
let initial_sysroot = config.initial_rustc.parent().unwrap().parent().unwrap();
let initial_lld = initial_sysroot
.join("lib")
.join("rustlib")
.join(config.build)
.join("bin")
.join("rust-lld");
let initial_target_libdir = if config.dry_run {
"/dummy/path/to/lib/".to_string()
} else {
output(
Command::new(&config.initial_rustc)
.arg("--target")
.arg(config.build)
.arg("--print")
.arg("target-libdir"),
)
};
let initial_lld =
Path::new(&initial_target_libdir).parent().unwrap().join("bin").join("rust-lld");
let mut build = Build {
initial_rustc: config.initial_rustc.clone(),