[7.1.0] Fix -fatal_warnings on macOS (#21018)

Fixes #20919 Closes #20924. Commit 3d7c5ae PiperOrigin-RevId: 601022242 Change-Id: I257023dcf9983cb2b3ce16079675f6b5f9409b86 Co-authored-by: Keith Smiley <[email protected]>
bazelbuild · Jan 25, 2024 · 0bf046d · 0bf046d
1 parent fa0660a
commit 0bf046d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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"],
+                )],
             ),
         ],
     )