bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #81641 - bjorn3:find_codegen_backend, r=davidtwco

Browse source 
Find codegen backends in more locations

* Search in the sysroot passed using `--sysroot` in addition to the default sysroot.
* Search for `librustc_codegen_$name.so` in addition to `librustc_codegen_$name-$release.so`.

This combined would allow putting `librustc_codegen_cranelift.so` in the right location of a sysroot passed using `--sysroot`.
This commit is contained in:
bors 2021-04-06 07:16:19 +00:00
commit 354cc751b7
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_driver/src/lib.rs
View file

@ -795,7 +795,7 @@ pub fn version(binary: &str, matches: &getopts::Matches) {
println!("host: {}", config::host_triple()); println!("host: {}", config::host_triple());
println!("release: {}", unw(util::release_str())); println!("release: {}", unw(util::release_str()));
if cfg!(feature = "llvm") { if cfg!(feature = "llvm") {
get_builtin_codegen_backend("llvm")().print_version(); get_builtin_codegen_backend(&None, "llvm")().print_version();
} }
} }
} }
@ -1089,7 +1089,7 @@ pub fn handle_options(args: &[String]) -> Option<getopts::Matches> {
if cg_flags.iter().any(|x| *x == "passes=list") { if cg_flags.iter().any(|x| *x == "passes=list") {
if cfg!(feature = "llvm") { if cfg!(feature = "llvm") {
get_builtin_codegen_backend("llvm")().print_passes(); get_builtin_codegen_backend(&None, "llvm")().print_passes();
} }
return None; return None;
} }

25
compiler/rustc_interface/src/util.rs
View file

@ -265,7 +265,7 @@ pub fn get_codegen_backend(sopts: &config::Options) -> Box<dyn CodegenBackend> {
let backend = match codegen_name { let backend = match codegen_name {
filename if filename.contains('.') => load_backend_from_dylib(filename.as_ref()), filename if filename.contains('.') => load_backend_from_dylib(filename.as_ref()),
codegen_name => get_builtin_codegen_backend(codegen_name), codegen_name => get_builtin_codegen_backend(&sopts.maybe_sysroot, codegen_name),
}; };
unsafe { unsafe {
@ -390,15 +390,21 @@ fn sysroot_candidates() -> Vec<PathBuf> {
} }
} }
pub fn get_builtin_codegen_backend(backend_name: &str) -> fn() -> Box<dyn CodegenBackend> { pub fn get_builtin_codegen_backend(
maybe_sysroot: &Option<PathBuf>,
backend_name: &str,
) -> fn() -> Box<dyn CodegenBackend> {
match backend_name { match backend_name {
#[cfg(feature = "llvm")] #[cfg(feature = "llvm")]
"llvm" => rustc_codegen_llvm::LlvmCodegenBackend::new, "llvm" => rustc_codegen_llvm::LlvmCodegenBackend::new,
_ => get_codegen_sysroot(backend_name), _ => get_codegen_sysroot(maybe_sysroot, backend_name),
} }
} }
pub fn get_codegen_sysroot(backend_name: &str) -> fn() -> Box<dyn CodegenBackend> { pub fn get_codegen_sysroot(
maybe_sysroot: &Option<PathBuf>,
backend_name: &str,
) -> fn() -> Box<dyn CodegenBackend> {
// For now we only allow this function to be called once as it'll dlopen a // For now we only allow this function to be called once as it'll dlopen a
// few things, which seems to work best if we only do that once. In // few things, which seems to work best if we only do that once. In
// general this assertion never trips due to the once guard in `get_codegen_backend`, // general this assertion never trips due to the once guard in `get_codegen_backend`,
@ -413,8 +419,9 @@ pub fn get_codegen_sysroot(backend_name: &str) -> fn() -> Box<dyn CodegenBackend
let target = session::config::host_triple(); let target = session::config::host_triple();
let sysroot_candidates = sysroot_candidates(); let sysroot_candidates = sysroot_candidates();
let sysroot = sysroot_candidates let sysroot = maybe_sysroot
.iter() .iter()
.chain(sysroot_candidates.iter())
.map(|sysroot| { .map(|sysroot| {
let libdir = filesearch::relative_target_lib_path(&sysroot, &target); let libdir = filesearch::relative_target_lib_path(&sysroot, &target);
sysroot.join(libdir).with_file_name("codegen-backends") sysroot.join(libdir).with_file_name("codegen-backends")
@ -450,8 +457,10 @@ pub fn get_codegen_sysroot(backend_name: &str) -> fn() -> Box<dyn CodegenBackend
let mut file: Option<PathBuf> = None; let mut file: Option<PathBuf> = None;
let expected_name = let expected_names = &[
format!("rustc_codegen_{}-{}", backend_name, release_str().expect("CFG_RELEASE")); format!("rustc_codegen_{}-{}", backend_name, release_str().expect("CFG_RELEASE")),
format!("rustc_codegen_{}", backend_name),
];
for entry in d.filter_map(|e| e.ok()) { for entry in d.filter_map(|e| e.ok()) {
let path = entry.path(); let path = entry.path();
let filename = match path.file_name().and_then(|s| s.to_str()) { let filename = match path.file_name().and_then(|s| s.to_str()) {
@ -462,7 +471,7 @@ pub fn get_codegen_sysroot(backend_name: &str) -> fn() -> Box<dyn CodegenBackend
continue; continue;
} }
let name = &filename[DLL_PREFIX.len()..filename.len() - DLL_SUFFIX.len()]; let name = &filename[DLL_PREFIX.len()..filename.len() - DLL_SUFFIX.len()];
if name != expected_name { if !expected_names.iter().any(|expected| expected == name) {
continue; continue;
} }
if let Some(ref prev) = file { if let Some(ref prev) = file {