diff --git a/src/cargo/core/compiler/build_context/target_info.rs b/src/cargo/core/compiler/build_context/target_info.rs index 45ffd7f4cc4..3083ab00e1c 100644 --- a/src/cargo/core/compiler/build_context/target_info.rs +++ b/src/cargo/core/compiler/build_context/target_info.rs @@ -41,8 +41,8 @@ pub struct TargetInfo { pub rustflags: Vec, /// Extra flags to pass to `rustdoc`, see `env_args`. pub rustdocflags: Vec, - /// REmove this when it hits stable (1.44) - pub supports_embed_bitcode: Option, + /// Remove this when it hits stable (1.44) + pub supports_bitcode_in_rlib: Option, } /// Kind of each file generated by a Unit, part of `FileType`. @@ -105,10 +105,10 @@ impl TargetInfo { .args(&rustflags) .env_remove("RUSTC_LOG"); - let mut embed_bitcode_test = process.clone(); - embed_bitcode_test.arg("-Cembed-bitcode"); - let supports_embed_bitcode = match kind { - CompileKind::Host => Some(rustc.cached_output(&embed_bitcode_test).is_ok()), + let mut bitcode_in_rlib_test = process.clone(); + bitcode_in_rlib_test.arg("-Cbitcode-in-rlib"); + let supports_bitcode_in_rlib = match kind { + CompileKind::Host => Some(rustc.cached_output(&bitcode_in_rlib_test).is_ok()), _ => None, }; @@ -196,7 +196,7 @@ impl TargetInfo { "RUSTDOCFLAGS", )?, cfg, - supports_embed_bitcode, + supports_bitcode_in_rlib, }) } diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs index faee6e570d9..92c7aabf933 100644 --- a/src/cargo/core/compiler/mod.rs +++ b/src/cargo/core/compiler/mod.rs @@ -821,10 +821,10 @@ fn build_base_args<'a, 'cfg>( .bcx .target_data .info(CompileKind::Host) - .supports_embed_bitcode + .supports_bitcode_in_rlib .unwrap() { - cmd.arg("-Cembed-bitcode=no"); + cmd.arg("-Cbitcode-in-rlib=no"); } } } diff --git a/tests/testsuite/rustc_info_cache.rs b/tests/testsuite/rustc_info_cache.rs index ef7b1fe7f8f..3ef091e4fe0 100644 --- a/tests/testsuite/rustc_info_cache.rs +++ b/tests/testsuite/rustc_info_cache.rs @@ -6,7 +6,7 @@ use std::env; #[cargo_test] fn rustc_info_cache() { - // TODO: need to gate this on nightly as soon as -Cembed-bitcode lands in + // TODO: need to gate this on nightly as soon as -Cbitcode-in-rlib lands in // nightly if true { return;