From 62959f8cc06c58ee9510afaab84e2789176578f3 Mon Sep 17 00:00:00 2001 From: Martin Kuntz Jacobsen Date: Mon, 16 Nov 2026 09:20:53 +0100 Subject: [PATCH 1/6] nested: indirect consumer builds a cc_binary with its own C++ toolchain (part of #12601) The indirect-consumer fixture gains own_cc, a module behind rules_dx in the module graph that registers the consumer's C++ toolchain. Flag off, toolchain resolution selects it and //:main builds with it; flag on, rules_dx's llvm toolchain wins. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Xut2hzwNN9Q3DFZx18pNic --- tools/testing/nested_bazel_harness_test.rs | 157 +++++++++++++++++++-- 1 file changed, 145 insertions(+), 12 deletions(-) diff --git a/tools/testing/nested_bazel_harness_test.rs b/tools/testing/nested_bazel_harness_test.rs index 5ca85e5d1a..afd1fec6ce 100644 --- a/tools/testing/nested_bazel_harness_test.rs +++ b/tools/testing/nested_bazel_harness_test.rs @@ -55,14 +55,101 @@ probe = rule( ) "#; -/// Starts a consumer whose only dependency is `mid`, a module that depends on rules_dx. +const OWN_CC_CONFIG: &str = r#"load("@rules_cc//cc:cc_toolchain_config_lib.bzl", "tool_path") +load("@rules_cc//cc/common:cc_common.bzl", "cc_common") + +def _impl(ctx): + return cc_common.create_cc_toolchain_config_info( + ctx = ctx, + toolchain_identifier = "own_cc", + host_system_name = "local", + target_system_name = "local", + target_cpu = "own", + target_libc = "own", + compiler = "own", + abi_version = "own", + abi_libc_version = "own", + tool_paths = [tool_path(name = name, path = ctx.attr.tool) for name in ["gcc", "ld", "ar", "cpp", "gcov", "nm", "objdump", "strip"]], + ) + +own_cc_config = rule(implementation = _impl, attrs = {"tool": attr.string(mandatory = True)}) +"#; + +/// The compiler of `own_cc`: writes `own_cc` to every `-o` output and an empty `-MF` file. +#[cfg(not(windows))] +const OWN_CC_TOOL: (&str, &str) = ( + "cc.sh", + "#!/bin/sh\nwhile [ $# -gt 0 ]; do\n case \"$1\" in\n -o) printf 'own_cc\\n' > \"$2\"; shift ;;\n -MF) : > \"$2\"; shift ;;\n esac\n shift\ndone\n", +); +#[cfg(windows)] +const OWN_CC_TOOL: (&str, &str) = ( + "cc.bat", + "@echo off\r\n:loop\r\nif \"%~1\"==\"\" exit /b 0\r\nif \"%~1\"==\"-o\" echo own_cc> \"%~2\"\r\nif \"%~1\"==\"-MF\" type nul> \"%~2\"\r\nshift\r\ngoto loop\r\n", +); + +/// Writes `own_cc`, the module that registers the consumer's own C++ toolchain. +fn write_own_cc(case: &Case) { + let (tool, script) = OWN_CC_TOOL; + case.write( + "own_cc/MODULE.bazel", + "module(name = \"own_cc\", version = \"0.0.0\")\nbazel_dep(name = \"rules_cc\", version = \"0.2.28\")\nregister_toolchains(\"//:toolchain\")\n", + ); + case.write("own_cc/config.bzl", OWN_CC_CONFIG); + case.write(&format!("own_cc/{tool}"), script); + #[cfg(unix)] + { + use std::os::unix::fs::PermissionsExt; + let path = case.root().join("own_cc").join(tool); + std::fs::set_permissions(&path, std::fs::Permissions::from_mode(0o755)) + .unwrap_or_else(|error| panic!("{}: {error}", path.display())); + } + case.write( + "own_cc/BUILD.bazel", + &format!( + r#"load("@rules_cc//cc/toolchains:cc_toolchain.bzl", "cc_toolchain") +load(":config.bzl", "own_cc_config") + +own_cc_config( + name = "config", + tool = "{tool}", +) + +filegroup( + name = "tools", + srcs = ["{tool}"], +) + +cc_toolchain( + name = "cc", + all_files = ":tools", + ar_files = ":tools", + as_files = ":tools", + compiler_files = ":tools", + dwp_files = ":tools", + linker_files = ":tools", + objcopy_files = ":tools", + strip_files = ":tools", + toolchain_config = ":config", +) + +toolchain( + name = "toolchain", + toolchain = ":cc", + toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", +) +"# + ), + ); +} + +/// Starts a consumer whose only dependency is `mid`, which depends on rules_dx and then on `own_cc`. fn indirect_consumer(name: &str) -> Case { let case = nested::harness_consumer(name); let module = dx_testing::read_text(&case.root().join("MODULE.bazel")); assert!(module.contains(DEP), "{module}"); let module = module.replace( DEP, - "bazel_dep(name = \"mid\", version = \"0.0.0\")\nlocal_path_override(module_name = \"mid\", path = \"mid\")\n", + "bazel_dep(name = \"mid\", version = \"0.0.0\")\nlocal_path_override(module_name = \"mid\", path = \"mid\")\nlocal_path_override(module_name = \"own_cc\", path = \"own_cc\")\n", ); case.write( "MODULE.bazel", @@ -78,19 +165,29 @@ fn indirect_consumer(name: &str) -> Case { } case.write( "mid/MODULE.bazel", - &format!("module(name = \"mid\", version = \"0.0.0\")\n{DEP}"), + &format!( + "module(name = \"mid\", version = \"0.0.0\")\n{DEP}bazel_dep(name = \"own_cc\", version = \"0.0.0\")\nbazel_dep(name = \"rules_cc\", version = \"0.2.28\")\n" + ), ); case.write("mid/BUILD.bazel", ""); + case.write( + "mid/cc.bzl", + "load(\"@rules_cc//cc:cc_binary.bzl\", _cc_binary = \"cc_binary\")\n\ncc_binary = _cc_binary\n", + ); + write_own_cc(&case); case.write(".bazelrc", ""); case.write("probe.bzl", PROBE); + case.write("main.c", "int main(void) { return 0; }\n"); case.write( "BUILD.bazel", - "load(\":probe.bzl\", \"probe\")\n\nprobe(name = \"probe\")\n", + "load(\"@mid//:cc.bzl\", \"cc_binary\")\nload(\":probe.bzl\", \"probe\")\n\nprobe(name = \"probe\")\n\ncc_binary(\n name = \"main\",\n srcs = [\"main.c\"],\n)\n", ); case.use_lock("indirect"); case } +const NO_DETECT: &str = "--repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1"; + /// The `Selected` lines of the C++ toolchain resolution of `//:probe`. fn selected_cc(case: &Case, flags: &[&str]) -> Vec { let mut args = vec![ @@ -98,7 +195,7 @@ fn selected_cc(case: &Case, flags: &[&str]) -> Vec { "--color=no", "--curses=no", "--toolchain_resolution_debug=@bazel_tools//tools/cpp:toolchain_type", - "--repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1", + NO_DETECT, ]; args.extend_from_slice(flags); args.push("//:probe"); @@ -112,15 +209,40 @@ fn selected_cc(case: &Case, flags: &[&str]) -> Vec { } #[test] -fn an_indirect_consumer_resolves_no_gated_rules_dx_toolchain() { +fn an_indirect_consumer_builds_with_its_own_cc_toolchain_unless_rules_dx_toolchains_are_on() { let case = indirect_consumer("indirect"); let selected = selected_cc(&case, &[]); - assert!(selected.is_empty(), "{selected:?}"); + assert!( + !selected.is_empty() && selected.iter().all(|line| line.contains("@@own_cc+//:cc")), + "{selected:?}" + ); let enabled = selected_cc(&case, &["--@@rules_dx+//config:toolchains=true"]); assert!( - !enabled.is_empty() && enabled.iter().all(|line| line.contains("@@llvm+//toolchain:")), + !enabled.is_empty() + && enabled + .iter() + .all(|line| line.contains("@@llvm+//toolchain:")), "{enabled:?}" ); + let run = case.bazel(&["build", "--color=no", "--curses=no", NO_DETECT, "//:main"]); + assert!(run.status.success(), "{}", run.combined()); + let files = case.bazel(&[ + "cquery", + "--color=no", + "--curses=no", + NO_DETECT, + "--output=files", + "//:main", + ]); + assert!(files.status.success(), "{}", files.combined()); + let binary = files + .stdout + .lines() + .map(str::trim) + .find(|line| !line.is_empty()) + .unwrap_or_else(|| panic!("no output file: {}", files.combined())); + let text = dx_testing::read_text(&case.root().join(binary)); + assert_eq!(text.trim(), "own_cc", "{binary}"); } #[test] @@ -208,13 +330,24 @@ fn a_download_outside_the_cache_sets_fails_with_its_url() { fn nested_commands_see_no_host_path_and_a_home_under_the_test_tmpdir() { let tmpdir = std::path::PathBuf::from(std::env::var_os("TEST_TMPDIR").expect("TEST_TMPDIR")); let case = nested::case("environment"); - std::fs::write(case.join("MODULE.bazel"), "module(name = \"environment\")\n") - .unwrap_or_else(|error| panic!("write MODULE.bazel: {error}")); + std::fs::write( + case.join("MODULE.bazel"), + "module(name = \"environment\")\n", + ) + .unwrap_or_else(|error| panic!("write MODULE.bazel: {error}")); let run = case.bazel(&["info", "output_base"]); assert!(run.status.success(), "{}", run.combined()); let output_base = std::path::PathBuf::from(run.stdout.trim()); - assert!(output_base.starts_with(&tmpdir), "{}", output_base.display()); - assert!(case.root().starts_with(&tmpdir), "{}", case.root().display()); + assert!( + output_base.starts_with(&tmpdir), + "{}", + output_base.display() + ); + assert!( + case.root().starts_with(&tmpdir), + "{}", + case.root().display() + ); let environ = std::fs::read(format!("/proc/{}/environ", case.servers()[0])).expect("environ"); let environ = String::from_utf8_lossy(&environ); let vars: Vec<&str> = environ.split('\0').collect(); From 6daf5f2dfbdb3f498c5a159f38d5f61c0d9233f9 Mon Sep 17 00:00:00 2001 From: Martin Kuntz Jacobsen Date: Mon, 16 Nov 2026 09:29:26 +0100 Subject: [PATCH 2/6] nested: own_cc reads link param files; rules_py finds sw_vers without PATH (part of #12601) Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Xut2hzwNN9Q3DFZx18pNic --- patches/rules_py/host_libc_glibc.patch | 6 +++++- tools/testing/nested_bazel_harness_test.rs | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/patches/rules_py/host_libc_glibc.patch b/patches/rules_py/host_libc_glibc.patch index 17e39382fe..23e371dcaa 100644 --- a/patches/rules_py/host_libc_glibc.patch +++ b/patches/rules_py/host_libc_glibc.patch @@ -1,6 +1,10 @@ --- a/uv/private/host/repository.bzl +++ b/uv/private/host/repository.bzl -@@ -28,33 +28,7 @@ +@@ -25,35 +25,9 @@ + if os == "osx": +- res = rctx.execute(["sw_vers", "-productVersion"]) ++ res = rctx.execute(["/usr/bin/sw_vers", "-productVersion"]) + ver = res.stdout.strip().split(".") return "libsystem", "{}.{}".format(ver[0], ver[1]) elif os == "linux": diff --git a/tools/testing/nested_bazel_harness_test.rs b/tools/testing/nested_bazel_harness_test.rs index afd1fec6ce..d3145d4a67 100644 --- a/tools/testing/nested_bazel_harness_test.rs +++ b/tools/testing/nested_bazel_harness_test.rs @@ -75,16 +75,16 @@ def _impl(ctx): own_cc_config = rule(implementation = _impl, attrs = {"tool": attr.string(mandatory = True)}) "#; -/// The compiler of `own_cc`: writes `own_cc` to every `-o` output and an empty `-MF` file. +/// The compiler of `own_cc`: writes `own_cc` to every `-o` output and an empty `-MF` file, also inside `@` parameter files. #[cfg(not(windows))] const OWN_CC_TOOL: (&str, &str) = ( "cc.sh", - "#!/bin/sh\nwhile [ $# -gt 0 ]; do\n case \"$1\" in\n -o) printf 'own_cc\\n' > \"$2\"; shift ;;\n -MF) : > \"$2\"; shift ;;\n esac\n shift\ndone\n", + "#!/bin/sh\nwhile [ $# -gt 0 ]; do\n case \"$1\" in\n @*) params=\"${1#@}\"; shift; set -- $(cat \"$params\") \"$@\"; continue ;;\n -o) printf 'own_cc\\n' > \"$2\"; shift ;;\n -MF) : > \"$2\"; shift ;;\n esac\n shift\ndone\n", ); #[cfg(windows)] const OWN_CC_TOOL: (&str, &str) = ( "cc.bat", - "@echo off\r\n:loop\r\nif \"%~1\"==\"\" exit /b 0\r\nif \"%~1\"==\"-o\" echo own_cc> \"%~2\"\r\nif \"%~1\"==\"-MF\" type nul> \"%~2\"\r\nshift\r\ngoto loop\r\n", + "@echo off\r\n:loop\r\nif \"%~1\"==\"\" exit /b 0\r\nset \"arg=%~1\"\r\nif \"%arg:~0,1%\"==\"@\" call :params \"%arg:~1%\"\r\nif \"%~1\"==\"-o\" echo own_cc> \"%~2\"\r\nif \"%~1\"==\"-MF\" type nul> \"%~2\"\r\nshift\r\ngoto loop\r\n:params\r\nset next=\r\nfor /f \"usebackq delims=\" %%L in (\"%~1\") do (\r\n if defined next (echo own_cc> \"%%~L\"& set next=)\r\n if \"%%~L\"==\"-o\" set next=1\r\n)\r\nexit /b 0\r\n", ); /// Writes `own_cc`, the module that registers the consumer's own C++ toolchain. From f605e1b7426dc3abdca3c129cb625fc2181108ab Mon Sep 17 00:00:00 2001 From: Martin Kuntz Jacobsen Date: Mon, 16 Nov 2026 09:38:03 +0100 Subject: [PATCH 3/6] cc: gate the Xcode C++ toolchain through rules_dx wrappers (part of #12601) rules_dx registered @local_config_apple_cc_toolchains//:all, whose toolchains_on gate is a single_version_override patch that consumers do not apply, so on macOS rules_dx's Xcode toolchain beat a consumer's own C++ toolchain. rules_dx now registers its own toolchain() wrappers around @apple_support//toolchain with //config:toolchains_on in target_settings. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Xut2hzwNN9Q3DFZx18pNic --- BUILD.bazel | 1 + MODULE.bazel | 2 +- cc/private/toolchain/apple/BUILD.bazel | 26 ++++++++++++++++++++++++++ tools/testing/toolchain_gate_test.rs | 2 +- 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 cc/private/toolchain/apple/BUILD.bazel diff --git a/BUILD.bazel b/BUILD.bazel index d5ba82fdf0..72867bc4aa 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -441,6 +441,7 @@ filegroup( "//cc/private:module_srcs", "//cc/private/context:module_srcs", "//cc/private/toolchain:module_srcs", + "//cc/private/toolchain/apple:module_srcs", "//cc/private/toolchain/clang_cl:module_srcs", "//cc/private/toolchain/llvm:module_srcs", "//cc/private/toolchain/gcc_features:module_srcs", diff --git a/MODULE.bazel b/MODULE.bazel index 80da86797c..df26f974f7 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -584,7 +584,7 @@ register_toolchains("//cc/private/toolchain:llvm_fuzzer_macos_x86_64") apple_cc_configure = use_extension("@apple_support//crosstool:setup.bzl", "apple_cc_configure_extension") use_repo(apple_cc_configure, "local_config_apple_cc_toolchains") -register_toolchains("@local_config_apple_cc_toolchains//:all") +register_toolchains("//cc/private/toolchain/apple:all") register_toolchains("//cc/private/toolchain/clang_cl:all") diff --git a/cc/private/toolchain/apple/BUILD.bazel b/cc/private/toolchain/apple/BUILD.bazel new file mode 100644 index 0000000000..bcbe30bf6a --- /dev/null +++ b/cc/private/toolchain/apple/BUILD.bazel @@ -0,0 +1,26 @@ +load("@apple_support//configs:platforms.bzl", "APPLE_PLATFORMS_CONSTRAINTS") + +filegroup( + name = "module_srcs", + srcs = glob(["**"]), + visibility = ["//:__subpackages__"], +) + +[ + toolchain( + name = "xcode_" + arch + "_" + cpu, + exec_compatible_with = [ + "@platforms//os:macos", + "@platforms//cpu:" + cpu, + ], + target_compatible_with = APPLE_PLATFORMS_CONSTRAINTS[arch], + target_settings = ["//config:toolchains_on"], + toolchain = "@apple_support//toolchain", + toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", + ) + for arch in APPLE_PLATFORMS_CONSTRAINTS.keys() + for cpu in [ + "arm64", + "x86_64", + ] +] diff --git a/tools/testing/toolchain_gate_test.rs b/tools/testing/toolchain_gate_test.rs index f5e6f57713..6b88f96fa6 100644 --- a/tools/testing/toolchain_gate_test.rs +++ b/tools/testing/toolchain_gate_test.rs @@ -29,6 +29,7 @@ const GATED: &[&str] = &[ "//cc/private/toolchain:msvc_windows_arm64", "//cc/private/toolchain:msvc_windows_x86_64", "//cc/private/toolchain:msvc_windows_x86_64_to_arm64", + "//cc/private/toolchain/apple:all", "//cc/private/toolchain/clang_cl:all", "//cc/private/toolchain/llvm:all", "//java/private/toolchain:all", @@ -42,7 +43,6 @@ const GATED: &[&str] = &[ "@dx_haskell_toolchains//:all", "@dx_python_toolchains//:all", "@dx_swift_toolchains//:all", - "@local_config_apple_cc_toolchains//:all", "@python_interpreters//:all", "@ruby_toolchains//:all", "@rust_toolchains//:all", From 0c45af388b0b905199d339040172a46da7156a15 Mon Sep 17 00:00:00 2001 From: Martin Kuntz Jacobsen Date: Mon, 16 Nov 2026 09:51:50 +0100 Subject: [PATCH 4/6] nested: indirect consumer cc test expects apple_support's registration on macOS (part of #12601) Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Xut2hzwNN9Q3DFZx18pNic --- tools/testing/nested_bazel_harness_test.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/testing/nested_bazel_harness_test.rs b/tools/testing/nested_bazel_harness_test.rs index d3145d4a67..cb61d9ac9e 100644 --- a/tools/testing/nested_bazel_harness_test.rs +++ b/tools/testing/nested_bazel_harness_test.rs @@ -212,8 +212,13 @@ fn selected_cc(case: &Case, flags: &[&str]) -> Vec { fn an_indirect_consumer_builds_with_its_own_cc_toolchain_unless_rules_dx_toolchains_are_on() { let case = indirect_consumer("indirect"); let selected = selected_cc(&case, &[]); + let expected = if cfg!(target_os = "macos") { + "@@apple_support+//toolchain:" + } else { + "@@own_cc+//:cc" + }; assert!( - !selected.is_empty() && selected.iter().all(|line| line.contains("@@own_cc+//:cc")), + !selected.is_empty() && selected.iter().all(|line| line.contains(expected)), "{selected:?}" ); let enabled = selected_cc(&case, &["--@@rules_dx+//config:toolchains=true"]); @@ -224,6 +229,9 @@ fn an_indirect_consumer_builds_with_its_own_cc_toolchain_unless_rules_dx_toolcha .all(|line| line.contains("@@llvm+//toolchain:")), "{enabled:?}" ); + if cfg!(target_os = "macos") { + return; + } let run = case.bazel(&["build", "--color=no", "--curses=no", NO_DETECT, "//:main"]); assert!(run.status.success(), "{}", run.combined()); let files = case.bazel(&[ From 1a354559b7fc6292b3160c0f1dce23816fbaca84 Mon Sep 17 00:00:00 2001 From: Martin Kuntz Jacobsen Date: Mon, 16 Nov 2026 10:24:28 +0100 Subject: [PATCH 5/6] nested: indirect consumer turns off apple_support's host toolchain so its own C++ toolchain wins on macOS (part of #12601) bazel_tools depends on apple_support, so apple_support's own register_toolchains("@local_config_apple_cc_toolchains//:all") sorts ahead of mid's deps in BFS order and wins on macOS. The fixture now passes --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1 next to BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1, so flag off selects @@own_cc+//:cc and builds the cc_binary with it on every platform; flag on on macOS selects @apple_support//toolchain only through rules_dx's gated //cc/private/toolchain/apple wrappers. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Xut2hzwNN9Q3DFZx18pNic --- tools/testing/nested_bazel_harness_test.rs | 47 ++++++++++------------ 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/tools/testing/nested_bazel_harness_test.rs b/tools/testing/nested_bazel_harness_test.rs index cb61d9ac9e..d3a6c60d93 100644 --- a/tools/testing/nested_bazel_harness_test.rs +++ b/tools/testing/nested_bazel_harness_test.rs @@ -95,7 +95,7 @@ fn write_own_cc(case: &Case) { "module(name = \"own_cc\", version = \"0.0.0\")\nbazel_dep(name = \"rules_cc\", version = \"0.2.28\")\nregister_toolchains(\"//:toolchain\")\n", ); case.write("own_cc/config.bzl", OWN_CC_CONFIG); - case.write(&format!("own_cc/{tool}"), script); + case.write(format!("own_cc/{tool}"), script); #[cfg(unix)] { use std::os::unix::fs::PermissionsExt; @@ -186,7 +186,11 @@ fn indirect_consumer(name: &str) -> Case { case } -const NO_DETECT: &str = "--repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1"; +/// Turns off the host C++ toolchains of `rules_cc` and `apple_support`. +const NO_DETECT: [&str; 2] = [ + "--repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1", + "--repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1", +]; /// The `Selected` lines of the C++ toolchain resolution of `//:probe`. fn selected_cc(case: &Case, flags: &[&str]) -> Vec { @@ -195,8 +199,8 @@ fn selected_cc(case: &Case, flags: &[&str]) -> Vec { "--color=no", "--curses=no", "--toolchain_resolution_debug=@bazel_tools//tools/cpp:toolchain_type", - NO_DETECT, ]; + args.extend_from_slice(&NO_DETECT); args.extend_from_slice(flags); args.push("//:probe"); let run = case.bazel(&args); @@ -212,36 +216,29 @@ fn selected_cc(case: &Case, flags: &[&str]) -> Vec { fn an_indirect_consumer_builds_with_its_own_cc_toolchain_unless_rules_dx_toolchains_are_on() { let case = indirect_consumer("indirect"); let selected = selected_cc(&case, &[]); - let expected = if cfg!(target_os = "macos") { - "@@apple_support+//toolchain:" - } else { - "@@own_cc+//:cc" - }; assert!( - !selected.is_empty() && selected.iter().all(|line| line.contains(expected)), + !selected.is_empty() && selected.iter().all(|line| line.contains("@@own_cc+//:cc")), "{selected:?}" ); let enabled = selected_cc(&case, &["--@@rules_dx+//config:toolchains=true"]); + let rules_dx_cc = if cfg!(target_os = "macos") { + "@@apple_support+//toolchain:" + } else { + "@@llvm+//toolchain:" + }; assert!( - !enabled.is_empty() - && enabled - .iter() - .all(|line| line.contains("@@llvm+//toolchain:")), + !enabled.is_empty() && enabled.iter().all(|line| line.contains(rules_dx_cc)), "{enabled:?}" ); - if cfg!(target_os = "macos") { - return; - } - let run = case.bazel(&["build", "--color=no", "--curses=no", NO_DETECT, "//:main"]); + let mut build = vec!["build", "--color=no", "--curses=no"]; + build.extend_from_slice(&NO_DETECT); + build.push("//:main"); + let run = case.bazel(&build); assert!(run.status.success(), "{}", run.combined()); - let files = case.bazel(&[ - "cquery", - "--color=no", - "--curses=no", - NO_DETECT, - "--output=files", - "//:main", - ]); + let mut cquery = vec!["cquery", "--color=no", "--curses=no", "--output=files"]; + cquery.extend_from_slice(&NO_DETECT); + cquery.push("//:main"); + let files = case.bazel(&cquery); assert!(files.status.success(), "{}", files.combined()); let binary = files .stdout From 120ee0cd3ecad0333cfde7c7eddee24021a7dcc3 Mon Sep 17 00:00:00 2001 From: Martin Kuntz Jacobsen Date: Mon, 16 Nov 2026 10:33:03 +0100 Subject: [PATCH 6/6] nested: refresh harness cache from nested_record run 43839479309 (part of #12601) Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Xut2hzwNN9Q3DFZx18pNic --- .../testing/nested_cache/harness.MODULE.bazel.lock | 5 +++-- tools/testing/nested_cache/harness.txt | 14 +++++++++++--- .../nested_cache/indirect.MODULE.bazel.lock | 5 +++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/tools/testing/nested_cache/harness.MODULE.bazel.lock b/tools/testing/nested_cache/harness.MODULE.bazel.lock index ca3c8ada39..0c66c0b1cb 100644 --- a/tools/testing/nested_cache/harness.MODULE.bazel.lock +++ b/tools/testing/nested_cache/harness.MODULE.bazel.lock @@ -229,8 +229,8 @@ "https://bcr.bazel.build/modules/protobuf/33.1/MODULE.bazel": "982c8a0cceab4d790076f72b7677faf836b0dfadc2b66a34aab7232116c4ae39", "https://bcr.bazel.build/modules/protobuf/33.4/MODULE.bazel": "114775b816b38b6d0ca620450d6b02550c60ceedfdc8d9a229833b34a223dc42", "https://bcr.bazel.build/modules/protobuf/34.0.bcr.1/MODULE.bazel": "74e541b0ba877813da786a11707d4e394433c157841d5111a36be0d44b907931", - "https://bcr.bazel.build/modules/protobuf/36.2/MODULE.bazel": "7c2b9060f7770778a606e2147e69a17465e2a08c61bfb337eaf2da61aaf62b5f", - "https://bcr.bazel.build/modules/protobuf/36.2/source.json": "f9167721eeaa0f65b255aa30f1eb7d7655617d8d63823c3c48521159cf67672f", + "https://bcr.bazel.build/modules/protobuf/37.0-rc3/MODULE.bazel": "a06e875ef86cf2c380f702d900a5c6351c2e8858883a07a2b7c8055fad353c19", + "https://bcr.bazel.build/modules/protobuf/37.0-rc3/source.json": "8a62d15c95ede5c19a3388a7b2be1db65e6acaeef1441552cd02e95238ab4bb5", "https://bcr.bazel.build/modules/pybind11_bazel/2.11.1/MODULE.bazel": "88af1c246226d87e65be78ed49ecd1e6f5e98648558c14ce99176da041dc378e", "https://bcr.bazel.build/modules/pybind11_bazel/2.12.0/MODULE.bazel": "e6f4c20442eaa7c90d7190d8dc539d0ab422f95c65a57cc59562170c58ae3d34", "https://bcr.bazel.build/modules/pybind11_bazel/3.0.0/MODULE.bazel": "a2bfa6020ed603a00d944161c63173c7f109774e99bee0c2cd8dbf24159f8134", @@ -398,6 +398,7 @@ "https://bcr.bazel.build/modules/rules_python/1.7.0/MODULE.bazel": "d01f995ecd137abf30238ad9ce97f8fc3ac57289c8b24bd0bf53324d937a14f8", "https://bcr.bazel.build/modules/rules_python/1.8.0/MODULE.bazel": "c151c025dbcc93d8f62ab68ecc313c9176a868a0e6386981bf2a12aec77cbe7b", "https://bcr.bazel.build/modules/rules_python/1.9.0/MODULE.bazel": "afc3a05f29f09f2d3ee95ad99a145250dab41a2b2d8d6f82cc91936b3213282c", + "https://bcr.bazel.build/modules/rules_python/2.3.0/MODULE.bazel": "45379a115e826bdd98f1b959d181acccedce8de70d9448ecc0b26640c8e49ec4", "https://bcr.bazel.build/modules/rules_python/2.4.6/MODULE.bazel": "edd87d5af3d4cc3c6e233c4450209bad2f4d6124d24c647670ee8062cfdf822e", "https://bcr.bazel.build/modules/rules_python/2.4.6/source.json": "2e5154205999e263cdee7399111b09acfb9361a205f29e95af93f9423be674d6", "https://bcr.bazel.build/modules/rules_robolectric/4.14.1.2/MODULE.bazel": "d44fec647d0aeb67b9f3b980cf68ba634976f3ae7ccd6c07d790b59b87a4f251", diff --git a/tools/testing/nested_cache/harness.txt b/tools/testing/nested_cache/harness.txt index f0b3f61492..59ae9406b5 100644 --- a/tools/testing/nested_cache/harness.txt +++ b/tools/testing/nested_cache/harness.txt @@ -239,8 +239,8 @@ https://bcr.bazel.build/modules/protobuf/32.1/MODULE.bazel 89cd2866a9cb07fee9ff7 https://bcr.bazel.build/modules/protobuf/33.1/MODULE.bazel 982c8a0cceab4d790076f72b7677faf836b0dfadc2b66a34aab7232116c4ae39 https://bcr.bazel.build/modules/protobuf/33.4/MODULE.bazel 114775b816b38b6d0ca620450d6b02550c60ceedfdc8d9a229833b34a223dc42 https://bcr.bazel.build/modules/protobuf/34.0.bcr.1/MODULE.bazel 74e541b0ba877813da786a11707d4e394433c157841d5111a36be0d44b907931 -https://bcr.bazel.build/modules/protobuf/36.2/MODULE.bazel 7c2b9060f7770778a606e2147e69a17465e2a08c61bfb337eaf2da61aaf62b5f -https://bcr.bazel.build/modules/protobuf/36.2/source.json f9167721eeaa0f65b255aa30f1eb7d7655617d8d63823c3c48521159cf67672f +https://bcr.bazel.build/modules/protobuf/37.0-rc3/MODULE.bazel a06e875ef86cf2c380f702d900a5c6351c2e8858883a07a2b7c8055fad353c19 +https://bcr.bazel.build/modules/protobuf/37.0-rc3/source.json 8a62d15c95ede5c19a3388a7b2be1db65e6acaeef1441552cd02e95238ab4bb5 https://bcr.bazel.build/modules/pybind11_bazel/2.11.1/MODULE.bazel 88af1c246226d87e65be78ed49ecd1e6f5e98648558c14ce99176da041dc378e https://bcr.bazel.build/modules/pybind11_bazel/2.12.0/MODULE.bazel e6f4c20442eaa7c90d7190d8dc539d0ab422f95c65a57cc59562170c58ae3d34 https://bcr.bazel.build/modules/pybind11_bazel/3.0.0/MODULE.bazel a2bfa6020ed603a00d944161c63173c7f109774e99bee0c2cd8dbf24159f8134 @@ -417,6 +417,7 @@ https://bcr.bazel.build/modules/rules_python/1.6.3/MODULE.bazel a7b80c42cb3de5ee https://bcr.bazel.build/modules/rules_python/1.7.0/MODULE.bazel d01f995ecd137abf30238ad9ce97f8fc3ac57289c8b24bd0bf53324d937a14f8 https://bcr.bazel.build/modules/rules_python/1.8.0/MODULE.bazel c151c025dbcc93d8f62ab68ecc313c9176a868a0e6386981bf2a12aec77cbe7b https://bcr.bazel.build/modules/rules_python/1.9.0/MODULE.bazel afc3a05f29f09f2d3ee95ad99a145250dab41a2b2d8d6f82cc91936b3213282c +https://bcr.bazel.build/modules/rules_python/2.3.0/MODULE.bazel 45379a115e826bdd98f1b959d181acccedce8de70d9448ecc0b26640c8e49ec4 https://bcr.bazel.build/modules/rules_python/2.4.6/MODULE.bazel edd87d5af3d4cc3c6e233c4450209bad2f4d6124d24c647670ee8062cfdf822e https://bcr.bazel.build/modules/rules_python/2.4.6/patches/module_dot_bazel_version.patch 712a4c1f5bb302f3866eac53f14187fb1e3b896244e37ef1da2dacaae82962b7 https://bcr.bazel.build/modules/rules_python/2.4.6/source.json 2e5154205999e263cdee7399111b09acfb9361a205f29e95af93f9423be674d6 @@ -522,7 +523,9 @@ https://github.com/bats-core/bats-core/archive/v1.10.0.tar.gz a1a9f7875aa4b6a948 https://github.com/bazel-contrib/bazel-lib/releases/download/v2.22.5/bazel-lib-v2.22.5.tar.gz 94e192033ca8027f26de71c9000a67ef9c73695c2b88e2c559045170917ead0c https://github.com/bazel-contrib/bazel-lib/releases/download/v3.7.2/bazel-lib-v3.7.2.tar.gz c75f8c375f9f2c73a565dba188f91a4e8d7ca16dd2b6152d3886c26bbf1c6532 https://github.com/bazel-contrib/bazel-lib/releases/download/v3.7.2/copy_to_directory-linux_amd64 62915fbc1a432eced2676458526d53915898068f4ae503f2e740049603922337 +https://github.com/bazel-contrib/bazel-lib/releases/download/v3.7.2/copy_to_directory-windows_amd64.exe a32c637d15393cd264dc323de87017524895a8084acb96fca2a23e9c693284a4 https://github.com/bazel-contrib/bazel-lib/releases/download/v3.7.2/spawn_binary-linux_amd64 fff56331defc1c191a62063c812cbc600fb42ca5824eda4fd41e601a804d36b4 +https://github.com/bazel-contrib/bazel-lib/releases/download/v3.7.2/spawn_binary-windows_amd64.exe 4a9bd9f061c180ca7c37ddaedf8cfbd997bbf42a8bfd416aa7f7bca8ceedd9a7 https://github.com/bazel-contrib/bazel_features/releases/download/v1.55.0/bazel_features-v1.55.0.tar.gz 2ed1fdce7e51ba2149dfab73eab6e402217c8e27d17e1d4a48d4d86bdd9eaef6 https://github.com/bazel-contrib/jq.bzl/releases/download/v0.4.0/jq.bzl-v0.4.0.tar.gz 21617eb71fb775a748ef5639131ab943ef39946bd2a4ce96ea60b03f985db0c5 https://github.com/bazel-contrib/rules_cuda/releases/download/v0.4.0/rules_cuda-v0.4.0.tar.gz 5e8a32ae93e32724f4159a90ab0da33431181dbf08c02c94db088110f68088ac @@ -557,9 +560,12 @@ https://github.com/bminor/glibc/archive/92d25389c255b0da9b56bc05694f0702cd22921a https://github.com/cerisier/glibc-headers/releases/download/2.28-20250512/x86_64-linux-gnu.2.28.tar.zst 8015f4a710987439dfdcde7539b62cc5db52d2cd9456af5e2e297494f13c56f3 https://github.com/cerisier/kernel-headers/releases/download/4.19.325-20250511/4.19.325-x86.tar.zst 55b232aa55b9f4aedbed6a743db0a2b7f4e92bb07b3ffeeb614e9dda30d34851 https://github.com/fmeum/with_cfg.bzl/releases/download/v0.12.0/with_cfg.bzl-v0.12.0.tar.gz 23c39c6dfca14dbd1607025c736c8bf4843f31958c0a87fbdb2c7d206585fea4 +https://github.com/hermeticbuild/bsdtar-prebuilt/releases/download/v3.8.1-3/tar_darwin_arm64 f78ae63e48f58be8e88bb1e44ab165503b8bdc7374cebdeb7fa9327629c88907 https://github.com/hermeticbuild/bsdtar-prebuilt/releases/download/v3.8.1-3/tar_linux_amd64 ae24dbc3ecf6ad628c2fdd205a52347fd4446589e750469766669e25cb80e22b +https://github.com/hermeticbuild/bsdtar-prebuilt/releases/download/v3.8.1-3/tar_windows_x86_64.exe 550fc86489a24c0774d3cafbe326c1da01f374521154e9f0b9b77332b48e8b46 https://github.com/hermeticbuild/hermetic-launcher/releases/download/v0.0.17/hermetic_launcher-v0.0.17.tar.gz 770951bf4bd5eb407571d3a21bbf002f1c6598e362fb233d03fdbb989df8ff61 https://github.com/hermeticbuild/hermetic-llvm/releases/download/llvm-23.1.2-2/llvm-toolchain-minimal-23.1.2-linux-amd64-musl.tar.zst 2808ea0503af3656373fc141ddc7d082b53c7f858efd5245aed0241734257348 +https://github.com/hermeticbuild/hermetic-llvm/releases/download/llvm-23.1.2-2/llvm-toolchain-minimal-23.1.2-windows-amd64.tar.zst bf497374c118ffd93dadf96f9c0859b3cdee21c58ff54b71e4209c85434208ed https://github.com/hermeticbuild/hermetic-llvm/releases/download/prebuilts-extras-20260429/toolchain-extra-prebuilts-20260429-linux-amd64-musl.tar.zst 418a27a0ab8ecf46e2e00bd4381efc0bcb54c28312261c4f36114842e5ecb20e https://github.com/hermeticbuild/hermetic-llvm/releases/download/v0.8.26/hermetic-llvm-v0.8.26.tar.gz b00dbcf7fdfa111ee9ea763b76b775e627696c27bc552cf63e74e0ea8e2ddfb7 https://github.com/hermeticbuild/llvm-redist/releases/download/llvmorg-23.1.2-r1/llvm-project-23.1.2.src.tar.zst 271da53a2feb0cb221a9276a14268a3b76ad802c7fc8fb1098291a43b06e4c56 @@ -567,10 +573,12 @@ https://github.com/hermeticbuild/rules_zig/releases/download/v0.17.0/rules_zig-0 https://github.com/jmillikin/rules_m4/releases/download/v0.3.1/rules_m4-v0.3.1.tar.xz 1d9b9977f67c3e33265dce554446c7d3f0f3cc2c10d7ced2e67a6931cf0a6f4e https://github.com/jvolkman/toml.bzl/releases/download/v0.5.0/toml.bzl-v0.5.0.tar.gz b5bfdd5c5488ad37d60db188d2d17bc093f719b88b20886ce9fb092bff6b0e67 https://github.com/miinso/rules_fortran/archive/f0cac73ebdcbda7bc01b38b8a4ee33869416c220.tar.gz ca07c12300ade0a7e5fff92eb95cc27e4618af993841b92a9784d239c34c7557 +https://github.com/mingw-w64/mingw-w64/archive/refs/tags/v14.0.0.tar.gz d71cc644cd5a37c337f2719f3e0c79d89e8d8d5fb9e2952a62d3fa23623dc137 https://github.com/obazl/rules_ocaml/archive/24fa272c7b59ad902c5c82e71aae397b63f05467.tar.gz a23ad90cff101aa9d0cea279462dad72dddf597fc23be7748fbb1bb63143705c https://github.com/periareon/rules_julia/releases/download/0.8.0/rules_julia-0.8.0.tar.gz 298424f537350d37142f1f056375a3c3cd65a3058ee4b7dcd555ed1c87df8684 https://github.com/periareon/rules_powershell/releases/download/0.3.1/rules_powershell-0.3.1.tar.gz 8ef875aa1dad8dc0f8f568547d2283f3d4b686b8e50374d6cdda4c5688fe6b7f -https://github.com/protocolbuffers/protobuf/releases/download/v36.2/protobuf-36.2.bazel.tar.gz 9ce44c3890ee93f8f403db2198ebd711fcf8beae3d13f18a36f5bc1458748f40 +https://github.com/protocolbuffers/protobuf/releases/download/v37.0-rc3/protobuf-37.0-rc3.bazel.tar.gz e55e3380c67ae237c806e9ce9490d0b98ac3ea7d43283a9c1c1051d6647e2662 https://github.com/scottpledger/yaml.bzl/releases/download/v0.1.2/yaml.bzl-v0.1.2.tar.gz 8262749910722af6c943b30ae16ba48f12abd8c00eeab525783892ca531dd8ab https://github.com/tweag/rules_haskell/archive/826018312ea91c80ff66fde1e1e39f76c42c07b8.tar.gz 86d126db53fa06ee935d94ee109420d3a68733377091f7914f62abe36c1972a1 +https://github.com/uutils/coreutils/releases/download/0.9.0/coreutils-0.9.0-x86_64-pc-windows-gnu.zip 3f84876d20b86e2b13ce4cca7d5fe220bc7773b92a3df844e70c2c9b590357d6 https://github.com/uutils/coreutils/releases/download/0.9.0/coreutils-0.9.0-x86_64-unknown-linux-musl.tar.gz 7fffbe9c835054f1143a5f2a68ef478efb427417163e0410c26c901da15647e5 diff --git a/tools/testing/nested_cache/indirect.MODULE.bazel.lock b/tools/testing/nested_cache/indirect.MODULE.bazel.lock index d3c4fad33f..934e3dbf30 100644 --- a/tools/testing/nested_cache/indirect.MODULE.bazel.lock +++ b/tools/testing/nested_cache/indirect.MODULE.bazel.lock @@ -229,8 +229,8 @@ "https://bcr.bazel.build/modules/protobuf/33.1/MODULE.bazel": "982c8a0cceab4d790076f72b7677faf836b0dfadc2b66a34aab7232116c4ae39", "https://bcr.bazel.build/modules/protobuf/33.4/MODULE.bazel": "114775b816b38b6d0ca620450d6b02550c60ceedfdc8d9a229833b34a223dc42", "https://bcr.bazel.build/modules/protobuf/34.0.bcr.1/MODULE.bazel": "74e541b0ba877813da786a11707d4e394433c157841d5111a36be0d44b907931", - "https://bcr.bazel.build/modules/protobuf/36.2/MODULE.bazel": "7c2b9060f7770778a606e2147e69a17465e2a08c61bfb337eaf2da61aaf62b5f", - "https://bcr.bazel.build/modules/protobuf/36.2/source.json": "f9167721eeaa0f65b255aa30f1eb7d7655617d8d63823c3c48521159cf67672f", + "https://bcr.bazel.build/modules/protobuf/37.0-rc3/MODULE.bazel": "a06e875ef86cf2c380f702d900a5c6351c2e8858883a07a2b7c8055fad353c19", + "https://bcr.bazel.build/modules/protobuf/37.0-rc3/source.json": "8a62d15c95ede5c19a3388a7b2be1db65e6acaeef1441552cd02e95238ab4bb5", "https://bcr.bazel.build/modules/pybind11_bazel/2.11.1/MODULE.bazel": "88af1c246226d87e65be78ed49ecd1e6f5e98648558c14ce99176da041dc378e", "https://bcr.bazel.build/modules/pybind11_bazel/2.12.0/MODULE.bazel": "e6f4c20442eaa7c90d7190d8dc539d0ab422f95c65a57cc59562170c58ae3d34", "https://bcr.bazel.build/modules/pybind11_bazel/3.0.0/MODULE.bazel": "a2bfa6020ed603a00d944161c63173c7f109774e99bee0c2cd8dbf24159f8134", @@ -396,6 +396,7 @@ "https://bcr.bazel.build/modules/rules_python/1.7.0/MODULE.bazel": "d01f995ecd137abf30238ad9ce97f8fc3ac57289c8b24bd0bf53324d937a14f8", "https://bcr.bazel.build/modules/rules_python/1.8.0/MODULE.bazel": "c151c025dbcc93d8f62ab68ecc313c9176a868a0e6386981bf2a12aec77cbe7b", "https://bcr.bazel.build/modules/rules_python/1.9.0/MODULE.bazel": "afc3a05f29f09f2d3ee95ad99a145250dab41a2b2d8d6f82cc91936b3213282c", + "https://bcr.bazel.build/modules/rules_python/2.3.0/MODULE.bazel": "45379a115e826bdd98f1b959d181acccedce8de70d9448ecc0b26640c8e49ec4", "https://bcr.bazel.build/modules/rules_python/2.4.6/MODULE.bazel": "edd87d5af3d4cc3c6e233c4450209bad2f4d6124d24c647670ee8062cfdf822e", "https://bcr.bazel.build/modules/rules_python/2.4.6/source.json": "2e5154205999e263cdee7399111b09acfb9361a205f29e95af93f9423be674d6", "https://bcr.bazel.build/modules/rules_robolectric/4.14.1.2/MODULE.bazel": "d44fec647d0aeb67b9f3b980cf68ba634976f3ae7ccd6c07d790b59b87a4f251",