use find-msvc-tools crate directly instead of cc

Author: lambdageek

Cargo.lock

@@ -1325,6 +1325,12 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d"
+
 [[package]]
 name = "flate2"
 version = "1.1.2"
@@ -4724,7 +4730,7 @@ dependencies = [
 name = "rustc_windows_rc"
 version = "0.0.0"
 dependencies = [
- "cc",
+ "find-msvc-tools",
 ]
 
 [[package]]

Cargo.toml

@@ -64,6 +64,7 @@ exclude = [
 bitflags = "2.9.3"
 derive-where = "1.6.0"
 either = "1.15.0"
+find-msvc-tools = "0.1"
 indexmap = "2.10.0"
 itertools = "0.12.1"
 # FIXME: Remove this pin once this rustix issue is resolved

compiler/rustc_windows_rc/Cargo.toml

@@ -5,7 +5,5 @@ edition = "2024"
 
 [dependencies]
 #tidy-alphabetical-start
-# `cc` updates often break things, so we pin it here. Cargo enforces "max 1 semver-compat version
-# per crate", so if you change this, you need to also change it in `rustc_llvm` and `rustc_codegen_ssa`.
-cc = "=1.2.16"
+find-msvc-tools.workspace = true
 #tidy-alphabetical-end

compiler/rustc_windows_rc/src/lib.rs

@@ -2,9 +2,7 @@
 //!
 //! Uses values from the `CFG_VERSION` and `CFG_RELEASE` environment variables
 //! to set the product and file version information in the Windows resource file.
-use std::{env, ffi, fs, path, process};
-
-use cc::windows_registry;
+use std::{env, fs, path, process};
 
 /// The template for the Windows resource file.
 const RESOURCE_TEMPLATE: &str = include_str!("../rustc.rc.in");
@@ -35,8 +33,7 @@ pub fn compile_windows_resource_file(
     resources_dir.push("resources");
     fs::create_dir_all(&resources_dir).unwrap();
 
-    let resource_compiler =
-        find_resource_compiler(&env::var("CARGO_CFG_TARGET_ARCH").unwrap()).expect("found rc.exe");
+    let resource_compiler = find_resource_compiler().expect("found rc.exe");
 
     let rc_path = resources_dir.join(file_stem.with_extension("rc"));
 
@@ -134,25 +131,26 @@ fn parse_version(version: &str) -> Option<ResourceVersion> {
 
 /// Find the Windows SDK resource compiler `rc.exe` for the given architecture or target triple.
 /// Returns `None` if the tool could not be found.
-fn find_resource_compiler(arch_or_target: &str) -> Option<path::PathBuf> {
-    find_windows_sdk_tool(arch_or_target, "rc.exe")
+fn find_resource_compiler() -> Option<path::PathBuf> {
+    find_windows_sdk_tool("rc.exe")
 }
 
 /// Find a Windows SDK tool for the given architecture or target triple.
 /// Returns `None` if the tool could not be found.
-fn find_windows_sdk_tool(arch_or_target: &str, tool_name: &str) -> Option<path::PathBuf> {
-    // windows_registry::find_tool can only find MSVC tools, not Windows SDK tools, but
-    // cc does include the Windows SDK tools in the PATH environment of MSVC tools.
+fn find_windows_sdk_tool(tool_name: &str) -> Option<path::PathBuf> {
+    let (ucrt_dir, ucrt_version) = find_msvc_tools::get_ucrt_dir()?;
 
-    let msvc_linker = windows_registry::find_tool(arch_or_target, "link.exe")?;
-    let path = &msvc_linker.env().iter().find(|(k, _)| k == "PATH")?.1;
-    find_tool_in_path(tool_name, path)
-}
+    // Determine the host architecture to find the right subdirectory in the Windows SDK
+    let host = match env::var("HOST").ok()?.split('-').next()? {
+        "x86" => "x86",
+        "x86_64" => "x64",
+        "aarch64" => "arm64",
+        _ => return None,
+    };
+
+    let mut tool_path = ucrt_dir.join("bin").join(&ucrt_version).join(host);
+
+    tool_path.push(tool_name);
 
-/// Find a tool in the directories in a given PATH-like string.
-fn find_tool_in_path<P: AsRef<ffi::OsStr>>(tool_name: &str, path: P) -> Option<path::PathBuf> {
-    env::split_paths(path.as_ref()).find_map(|p| {
-        let tool_path = p.join(tool_name);
-        if tool_path.try_exists().unwrap_or(false) { Some(tool_path) } else { None }
-    })
+    Some(tool_path)
 }