Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
26 changes: 26 additions & 0 deletions cc/private/toolchain/apple/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -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",
]
]
6 changes: 5 additions & 1 deletion patches/rules_py/host_libc_glibc.patch
Original file line number Diff line number Diff line change
@@ -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":
Expand Down
162 changes: 150 additions & 12 deletions tools/testing/nested_bazel_harness_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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, 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 @*) 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\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.
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",
Expand All @@ -78,28 +165,42 @@ 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
}

/// 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<String> {
let mut args = vec![
"cquery",
"--color=no",
"--curses=no",
"--toolchain_resolution_debug=@bazel_tools//tools/cpp:toolchain_type",
"--repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1",
];
args.extend_from_slice(&NO_DETECT);
args.extend_from_slice(flags);
args.push("//:probe");
let run = case.bazel(&args);
Expand All @@ -112,15 +213,41 @@ fn selected_cc(case: &Case, flags: &[&str]) -> Vec<String> {
}

#[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"]);
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:?}"
);
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 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
.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]
Expand Down Expand Up @@ -208,13 +335,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();
Expand Down
5 changes: 3 additions & 2 deletions tools/testing/nested_cache/harness.MODULE.bazel.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Loading
Loading