diff --git a/patches/README.md b/patches/README.md index 2fd1227554..0e9c7dcef7 100644 --- a/patches/README.md +++ b/patches/README.md @@ -40,7 +40,7 @@ When the upstream fix is in a release rules_dx uses, delete the patch file, its | `rules_rust` | 0.75.0 | `cargo_toml_env_vars_flag.patch` | Root only. `--@rules_rust//cargo/settings:cargo_toml_env_vars` defaults to `False`: `cargo_toml_env_vars` writes an empty env file, so `cargo_toml_variable_extractor` and the 55 crates it needs are never fetched (drop when a rules_rust release has the flag) | | `rules_rust` | 0.75.0 | `exec_scope_universal.patch` | Root only. `toolchain_linker_preference` and `use_default_shell_env` have `scope = "universal"`, so exec tools keep reading them under that flag, and `use_default_shell_env` defaults to `False` (drop when a rules_rust release has it) | | `rules_rust` | 0.75.0 | `static_archive_link_arg.patch` | The trailing link flag of a native static library is its archive path, not `-l`, so a `lib.so` next to the archive is never linked when Rustc runs unsandboxed (bazelbuild/rules_rust#3993; drop when a rules_rust release has it). Consumer fix: #12010 | -| `rules_rust` | 0.75.0 | `cargo_build_script_no_coverage.patch` | Build scripts configure cc features without `coverage`, `gcc_coverage_map_format` and `llvm_coverage_map_format`, so apple_support's unconditional `GCOV_GCNO_FILE=%{gcov_gcno_file}` env entry does not fail analysis on macOS under coverage (drop when a rules_rust release has it). Consumer fix: #12155 | +| `rules_rust` | 0.75.0 | `cargo_build_script_no_coverage.patch` | Build scripts configure cc features without `coverage`, `coverage_enabled`, `coverage_instrumented`, `gcc_coverage_map_format` and `llvm_coverage_map_format`, so apple_support's unconditional `GCOV_GCNO_FILE=%{gcov_gcno_file}` env entry does not fail analysis on macOS under coverage (bazelbuild/rules_rust#4433; drop when a rules_rust release has it). Consumer fix: #12155 | | `rules_rust` | 0.75.0 | `cargo_build_script_apple_deployment_target.patch` | Build scripts get `MACOSX_DEPLOYMENT_TARGET` and its per-OS siblings from the cc toolchain's `-target` triple, so cc-rs does not add an SDK-derived `-mmacosx-version-min=` that clashes with it under `-Werror` (drop when a rules_rust release has it). Consumers get `common:macos --action_env=MACOSX_DEPLOYMENT_TARGET=14.0` from the dx preset. Consumer fix: #13323 | | `rules_rust` | 0.75.0 | `crate_universe_module_labels.patch` | Root only. Crate hub lockfiles pin the root module's own labels as `@@+//`, so the pinned lockfile resolves when rules_dx is a dependency; the root build reads them back as `@@//` | | `rules_rust` | 0.75.0 | `windows_exec_foreign_target_cc_linker.patch` | Root only. A generated `rust_toolchain` with a Windows exec triple and a non-Windows target triple sets `linker_preference = "cc"`, so those targets link through the cc toolchain; one with a non-Windows exec triple, an MSVC target triple and `rust-lld` sets `linker_preference = "rust"`, so those targets link with `rust-lld` as `lld-link` | @@ -107,7 +107,7 @@ When the upstream fix is in a release rules_dx uses, delete the patch file, its | `windows_support` | 0.4.1 | `dx_cc_extension.patch` | Root only. `msvc_runtime.bzl` and `windows_sdk.bzl` export the repository functions and configure attributes that the `cc` extension calls | | `windows_support` | 0.4.1 | `license_ids.patch` | Root only. The `msvc_runtime` repository fails unless the accepted license ids file, from the `license` tag or the `cc` extension, lists `visual-studio-build-tools`, and reads no environment variable | | `windows_support` | 0.4.1 | `pins.patch` | Root only. `msvc_runtime` reads the Visual Studio installer manifest URL and integrity from the `pins` file when it is set | -| `apple_support` | 2.12.0 | `gcov_gcno_file.patch` | `GCOV_GCNO_FILE` is set only when `gcov_gcno_file` is available, so `cc_common.get_environment_variables` without it (rules_go `cgo_context_data`, rules_rust build scripts) does not fail analysis on macOS under coverage (drop when an apple_support release has it). Consumer fix: #12155 | +| `apple_support` | 2.12.0 | `gcov_gcno_file.patch` | `GCOV_GCNO_FILE` is set only when `gcov_gcno_file` is available, so `cc_common.get_environment_variables` without it (rules_go `cgo_context_data`, rules_rust build scripts) does not fail analysis on macOS under coverage (bazelbuild/apple_support#693, merged after 2.12.0; drop when an apple_support release has it). Consumer fix: #12155 | | `apple_support` | 2.12.0 | `toolchains_gate.patch` | Root only. The Apple C++ toolchains have `target_settings = ["@@//config:toolchains_on"]` | | `apple_support` | 2.12.0 | `xcode_absolute_tools.patch` | Xcode and C++ toolchain discovery run `/usr/bin/env` and `/usr/bin/xcrun`, so they work with no host `PATH`. Consumer fix: #11150 | | `elfutils` | 0.195 | `musl.patch` | Root only. libdwfl compiles without argp, fts and GNU `strerror_r` on musl, so `//tools/coverage/kcov:kcov_static` links fully static | diff --git a/patches/apple_support/gcov_gcno_file.patch b/patches/apple_support/gcov_gcno_file.patch index d193bc2b7c..979582304e 100644 --- a/patches/apple_support/gcov_gcno_file.patch +++ b/patches/apple_support/gcov_gcno_file.patch @@ -1,4 +1,4 @@ -Upstream: none (not yet sent upstream) +Upstream: bazelbuild/apple_support#693 diff --git a/crosstool/cc_toolchain_config.bzl b/crosstool/cc_toolchain_config.bzl --- a/crosstool/cc_toolchain_config.bzl +++ b/crosstool/cc_toolchain_config.bzl diff --git a/patches/rules_rust/cargo_build_script_no_coverage.patch b/patches/rules_rust/cargo_build_script_no_coverage.patch index 49c98b2052..3d092fea53 100644 --- a/patches/rules_rust/cargo_build_script_no_coverage.patch +++ b/patches/rules_rust/cargo_build_script_no_coverage.patch @@ -6,7 +6,7 @@ Upstream: bazelbuild/rules_rust#4433 # We hope that the linker env is sufficient for the whole cc_toolchain. if use_cc_toolchain: - cc_toolchain, feature_configuration = find_cc_toolchain(ctx) -+ cc_toolchain, feature_configuration = find_cc_toolchain(ctx, extra_unsupported_features = ["coverage", "gcc_coverage_map_format", "llvm_coverage_map_format"]) ++ cc_toolchain, feature_configuration = find_cc_toolchain(ctx, extra_unsupported_features = ["coverage", "coverage_enabled", "coverage_instrumented", "gcc_coverage_map_format", "llvm_coverage_map_format"]) else: cc_toolchain, feature_configuration = None, None linker, _, link_args, linker_env = get_linker_and_args(ctx, "bin", toolchain, cc_toolchain, feature_configuration, None)