From b46ad371191820c313874ac47fa3184096e1bdfc Mon Sep 17 00:00:00 2001
From: Philipp Stephani <p.stephani2@gmail.com>
Date: Sat, 4 Jul 2026 20:57:51 +0200
Subject: [PATCH] Revert "Add a workaround for
 https://github.com/llvm/llvm-project/issues/121984"

This reverts commit 4ed697d372668179d68292bbafbfdeac27ab8eed.

rules_cc issue https://github.com/bazelbuild/rules_cc/issues/729
has been fixed, so this workaround should no longer be necessary.
---
 private/cc_config.bzl | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/private/cc_config.bzl b/private/cc_config.bzl
index b2ce1ee1d..0833eb3c6 100644
--- a/private/cc_config.bzl
+++ b/private/cc_config.bzl
@@ -50,12 +50,6 @@ COPTS = select({
 }) + select({
     Label("@rules_cc//cc/compiler:clang"): [
         "-Wno-nullability-extension",
-        # Work around https://github.com/llvm/llvm-project/issues/121984 and
-        # https://github.com/bazelbuild/rules_cc/issues/729.
-        "--system-header-prefix=absl/",
-        "--system-header-prefix=google/",
-        "--system-header-prefix=tools/",
-        "--system-header-prefix=upb/",
     ],
     Label("//conditions:default"): [],
 }) + select({