Expose target libdir information via print command.

With custom libdir it is required to have an access to library
placement.
This commit is contained in:
O01eg 2020-03-01 14:33:52 +03:00
parent ee50590803
commit 4023e5df7e
No known key found for this signature in database
GPG Key ID: DB49D45C128F6BB2
2 changed files with 6 additions and 0 deletions

View File

@ -676,6 +676,10 @@ impl RustcDefaultCalls {
println!("{}", targets.join("\n")); println!("{}", targets.join("\n"));
} }
Sysroot => println!("{}", sess.sysroot.display()), Sysroot => println!("{}", sess.sysroot.display()),
TargetLibdir => println!(
"{}",
sess.target_tlib_path.as_ref().unwrap_or(&sess.host_tlib_path).dir.display()
),
TargetSpec => println!("{}", sess.target.target.to_json().pretty()), TargetSpec => println!("{}", sess.target.target.to_json().pretty()),
FileNames | CrateName => { FileNames | CrateName => {
let input = input.unwrap_or_else(|| { let input = input.unwrap_or_else(|| {

View File

@ -391,6 +391,7 @@ impl ExternEntry {
pub enum PrintRequest { pub enum PrintRequest {
FileNames, FileNames,
Sysroot, Sysroot,
TargetLibdir,
CrateName, CrateName,
Cfg, Cfg,
TargetList, TargetList,
@ -1344,6 +1345,7 @@ fn collect_print_requests(
"crate-name" => PrintRequest::CrateName, "crate-name" => PrintRequest::CrateName,
"file-names" => PrintRequest::FileNames, "file-names" => PrintRequest::FileNames,
"sysroot" => PrintRequest::Sysroot, "sysroot" => PrintRequest::Sysroot,
"target-libdir" => PrintRequest::TargetLibdir,
"cfg" => PrintRequest::Cfg, "cfg" => PrintRequest::Cfg,
"target-list" => PrintRequest::TargetList, "target-list" => PrintRequest::TargetList,
"target-cpus" => PrintRequest::TargetCPUs, "target-cpus" => PrintRequest::TargetCPUs,