Skip to content

Commit ce0b647

Browse files
committed
Auto merge of #159579 - JonathanBrouwer:rollup-TlvztYP, r=JonathanBrouwer
Rollup of 5 pull requests Successful merges: - rust-lang/rust#159188 (Always generate private and hidden items in JSON docs of the stdlib) - rust-lang/rust#159567 (Update rustc crate crossbeam-epoch to 0.9.20) - rust-lang/rust#150732 (Convert `-Ctarget-cpu` into a target-modifier for AVR, AMDGCN and NVPTX ) - rust-lang/rust#159549 (restrict const-eval-related 'content' triggers to library/ folder) - rust-lang/rust#159570 (fix ICE in opsem inhabitedness check)
2 parents f8e65ac + f9a02f3 commit ce0b647

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ use rustc_codegen_ssa::{CompiledModules, CrateInfo, TargetConfig, back};
4242
use rustc_log::tracing::info;
4343
use rustc_middle::dep_graph::WorkProductMap;
4444
use rustc_session::Session;
45-
use rustc_session::config::OutputFilenames;
45+
use rustc_session::config::{NATIVE_CPU, OutputFilenames};
4646
use rustc_span::{Symbol, sym};
4747
use rustc_target::spec::{Arch, CfgAbi, Env, Os};
4848

@@ -341,7 +341,7 @@ fn build_isa(sess: &Session, jit: bool) -> Arc<dyn TargetIsa + 'static> {
341341
let flags = settings::Flags::new(flags_builder);
342342

343343
let isa_builder = match sess.opts.cg.target_cpu.as_deref() {
344-
Some("native") => cranelift_native::builder_with_options(true).unwrap(),
344+
Some(NATIVE_CPU) => cranelift_native::builder_with_options(true).unwrap(),
345345
Some(value) => {
346346
let mut builder =
347347
cranelift_codegen::isa::lookup(target_triple.clone()).unwrap_or_else(|err| {

0 commit comments

Comments
 (0)