Auto merge of #8134 - nnethercote:bitcode-in-rlib, r=alexcrichton

Change `-Cembed-bitcode=no` use to `-Cbitcode-in-rlib=no`.

Because the latter will replace the planned use of the former in rustc.

Author: bors

src/cargo/core/compiler/build_context/target_info.rs

@@ -40,8 +40,8 @@ pub struct TargetInfo {
     pub rustflags: Vec<String>,
     /// Extra flags to pass to `rustdoc`, see `env_args`.
     pub rustdocflags: Vec<String>,
-    /// REmove this when it hits stable (1.44)
-    pub supports_embed_bitcode: Option<bool>,
+    /// Remove this when it hits stable (1.44)
+    pub supports_bitcode_in_rlib: Option<bool>,
 }
 
 /// Kind of each file generated by a Unit, part of `FileType`.
@@ -104,10 +104,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,
         };
 
@@ -195,7 +195,7 @@ impl TargetInfo {
                 "RUSTDOCFLAGS",
             )?,
             cfg,
-            supports_embed_bitcode,
+            supports_bitcode_in_rlib,
         })
     }
 

src/cargo/core/compiler/mod.rs

@@ -813,10 +813,10 @@ fn build_base_args(
                 .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");
             }
         }
     }

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;