about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authoronur-ozkan <work@onurozkan.dev>2024-12-02 08:40:00 +0300
committeronur-ozkan <work@onurozkan.dev>2024-12-02 08:44:46 +0300
commit99e726b19490b489fb044902e3c2a487b6ff96a6 (patch)
tree6e06639eb1dab7102c82a06c7c2ee033f0699551 /src/bootstrap
parent20630c54aa416b6fc7282ac3555b45122a948d89 (diff)
downloadrust-99e726b19490b489fb044902e3c2a487b6ff96a6.tar.gz
rust-99e726b19490b489fb044902e3c2a487b6ff96a6.zip
add "optimized-compiler-builtins" option coverage for ci-rustc
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/src/core/config/config.rs17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index cabd62dea9d..b06147055f2 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -3125,11 +3125,15 @@ fn check_incompatible_options_for_ci_rustc(
         };
     }
 
-    err!(
-        current_config_toml.build.as_ref().and_then(|b| b.profiler),
-        ci_config_toml.build.as_ref().and_then(|b| b.profiler),
-        "build"
-    );
+    let current_profiler = current_config_toml.build.as_ref().and_then(|b| b.profiler);
+    let profiler = ci_config_toml.build.as_ref().and_then(|b| b.profiler);
+    err!(current_profiler, profiler, "build");
+
+    let current_optimized_compiler_builtins =
+        current_config_toml.build.as_ref().and_then(|b| b.optimized_compiler_builtins);
+    let optimized_compiler_builtins =
+        ci_config_toml.build.as_ref().and_then(|b| b.optimized_compiler_builtins);
+    err!(current_optimized_compiler_builtins, optimized_compiler_builtins, "build");
 
     // We always build the in-tree compiler on cross targets, so we only care
     // about the host target here.
@@ -3141,7 +3145,8 @@ fn check_incompatible_options_for_ci_rustc(
                 "Target specific config for '{host_str}' is not present for CI-rustc"
             ))?;
 
-            err!(current_cfg.profiler, ci_cfg.profiler, "build");
+            let profiler = &ci_cfg.profiler;
+            err!(current_cfg.profiler, profiler, "build");
         }
     }