From 3d7c5ae47e2a02ccd81eb8024f22d56ae7811c9b Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Tue, 23 Jan 2024 23:40:09 -0800 Subject: [PATCH] Fix -fatal_warnings on macOS Fixes https://github.com/bazelbuild/bazel/issues/20919 Closes #20924. PiperOrigin-RevId: 601022242 Change-Id: I257023dcf9983cb2b3ce16079675f6b5f9409b86 --- tools/cpp/unix_cc_toolchain_config.bzl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/cpp/unix_cc_toolchain_config.bzl b/tools/cpp/unix_cc_toolchain_config.bzl index a4fb2f606e7eb8..4fbeaafb86107b 100644 --- a/tools/cpp/unix_cc_toolchain_config.bzl +++ b/tools/cpp/unix_cc_toolchain_config.bzl @@ -14,6 +14,7 @@ """A Starlark cc_toolchain configuration rule""" +load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES") load( "@bazel_tools//tools/cpp:cc_toolchain_config_lib.bzl", "action_config", @@ -29,7 +30,6 @@ load( "variable_with_value", "with_feature_set", ) -load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES") def _target_os_version(ctx): platform_type = ctx.fragments.apple.single_arch_platform.platform_type @@ -1286,7 +1286,9 @@ def _impl(ctx): ), flag_set( actions = all_link_actions, - flag_groups = [flag_group(flags = ["-Wl,-fatal-warnings"])], + flag_groups = [flag_group( + flags = ["-Wl,-fatal-warnings"] if is_linux else ["-Wl,-fatal_warnings"], + )], ), ], )