Auto merge of rust-lang#113382 - lqd:test-mcp510, r=<try>

[perf] test MCP510 r? `@ghost`
rust-lang-ci · Oct 11, 2024 · ad3adbd · ad3adbd
2 parents 484c8e7 + cec3c69
commit ad3adbd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/compiler/rustc_session/src/options.rs b/compiler/rustc_session/src/options.rs
@@ -1705,8 +1705,18 @@ options! {
         "show all expected values in check-cfg diagnostics (default: no)"),
     checksum_hash_algorithm: Option<SourceFileHashAlgorithm> = (None, parse_cargo_src_file_hash, [TRACKED],
         "hash algorithm of source files used to check freshness in cargo (`blake3` or `sha256`)"),
-    codegen_backend: Option<String> = (None, parse_opt_string, [TRACKED],
-        "the backend to use"),
+    codegen_backend: Option<String> = (
+        {
+            #[cfg(bootstrap)]
+            {
+                None
+            }
+
+            #[cfg(not(bootstrap))]
+            {
+                Some("cranelift".into())
+            }
+        }, parse_opt_string, [TRACKED], "the backend to use"),
     combine_cgu: bool = (false, parse_bool, [TRACKED],
         "combine CGUs into a single one"),
     coverage_options: CoverageOptions = (CoverageOptions::default(), parse_coverage_options, [TRACKED],

diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
@@ -448,7 +448,10 @@ impl Builder {
         for pkg in PkgType::all() {
             match pkg {
                 // rustc/rust-std/cargo/docs are all required
-                PkgType::Rustc | PkgType::Cargo | PkgType::HtmlDocs => {
+                PkgType::Rustc
+                | PkgType::Cargo
+                | PkgType::HtmlDocs
+                | PkgType::RustcCodegenCranelift => {
                     components.push(host_component(pkg));
                 }
                 PkgType::RustStd => {
@@ -476,7 +479,6 @@ impl Builder {
                 | PkgType::LlvmTools
                 | PkgType::RustAnalysis
                 | PkgType::JsonDocs
-                | PkgType::RustcCodegenCranelift
                 | PkgType::LlvmBitcodeLinker => {
                     extensions.push(host_component(pkg));
                 }