diff options
| author | khyperia <github@khyperia.com> | 2020-09-17 12:14:18 +0200 |
|---|---|---|
| committer | khyperia <github@khyperia.com> | 2020-09-17 12:18:09 +0200 |
| commit | 48655c2d2ca8590c7627f32839ba921297290a1a (patch) | |
| tree | a415b07578f7df2d23acd60c10054c52d1d88bfa /compiler/rustc_interface | |
| parent | c946c40d9d47328fc1a08919dec174a77c12fd6b (diff) | |
| download | rust-48655c2d2ca8590c7627f32839ba921297290a1a.tar.gz rust-48655c2d2ca8590c7627f32839ba921297290a1a.zip | |
PR feedback
Diffstat (limited to 'compiler/rustc_interface')
| -rw-r--r-- | compiler/rustc_interface/src/util.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_interface/src/util.rs b/compiler/rustc_interface/src/util.rs index c4d89850dad..0eed6938c31 100644 --- a/compiler/rustc_interface/src/util.rs +++ b/compiler/rustc_interface/src/util.rs @@ -65,7 +65,7 @@ pub fn create_session( lint_caps: FxHashMap<lint::LintId, lint::Level>, descriptions: Registry, ) -> (Lrc<Session>, Lrc<Box<dyn CodegenBackend>>) { - let codegen_backend = get_codegen_backend(sopts.debugging_opts.codegen_backend.as_deref()); + let codegen_backend = get_codegen_backend(&sopts); // target_override is documented to be called before init(), so this is okay let target_override = codegen_backend.target_override(&sopts); @@ -224,13 +224,13 @@ fn load_backend_from_dylib(path: &Path) -> fn() -> Box<dyn CodegenBackend> { } } -pub fn get_codegen_backend(codegen_name: Option<&str>) -> Box<dyn CodegenBackend> { +pub fn get_codegen_backend(sopts: &config::Options) -> Box<dyn CodegenBackend> { static INIT: Once = Once::new(); static mut LOAD: fn() -> Box<dyn CodegenBackend> = || unreachable!(); INIT.call_once(|| { - let codegen_name = codegen_name.unwrap_or("llvm"); + let codegen_name = sopts.debugging_opts.codegen_backend.as_deref().unwrap_or("llvm"); let backend = match codegen_name { filename if filename.contains('.') => load_backend_from_dylib(filename.as_ref()), codegen_name => get_builtin_codegen_backend(codegen_name), |
