From 9195c96ae75430a60c2abac3ef8d1b36a0aafe28 Mon Sep 17 00:00:00 2001
From: Sandy Zhang <sandyzhang@google.com>
Date: Wed, 2 Aug 2023 10:22:24 -0700
Subject: [PATCH] Add a release flag to disambiguate between release and local
 config_settings.

This flag will be set in UPB which will be submitted separately due to version skew between repos.

This attempts to fix the following error from local and release settings both matching.
```
ERROR: /workspace/_build/out/external/upb/python/dist/BUILD.bazel:251:9: Illegal ambiguous match on configurable attribute "platform" in @upb//python/dist:binary_wheel:
@upb//python/dist:linux_x86_64_local
@upb//python/dist:windows_x86_64
Multiple matches are not allowed unless one is unambiguously more specialized or they resolve to the same value. See https://bazel.build/reference/be/functions#select.
```
PiperOrigin-RevId: 553184373
---
 toolchain/BUILD.bazel        | 10 ++++++++--
 toolchain/toolchains.bazelrc |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/toolchain/BUILD.bazel b/toolchain/BUILD.bazel
index 5bc8c8a03094..d6bd1748d82e 100644
--- a/toolchain/BUILD.bazel
+++ b/toolchain/BUILD.bazel
@@ -1,9 +1,15 @@
 load(":cc_toolchain_config.bzl", "cc_toolchain_config")
+load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 
 package(default_visibility = ["//visibility:public"])
 
 filegroup(name = "empty")
 
+bool_flag(
+    name = "release",
+    build_setting_default = False,
+)
+
 TOOLCHAINS = {
     "osx-x86_64": "cc-compiler-osx-x86_64",
     "osx-aarch_64": "cc-compiler-osx-aarch_64",
@@ -19,7 +25,7 @@ TOOLCHAINS = {
 
 cc_toolchain_suite(
     name = "clang_suite",
-    toolchains = TOOLCHAINS
+    toolchains = TOOLCHAINS,
 )
 
 [
@@ -50,8 +56,8 @@ cc_toolchain_config(
 
 cc_toolchain_config(
     name = "linux-aarch_64-config",
-    sysroot = "/opt/manylinux/2014/aarch64",
     linker_path = "/usr/bin/ld",
+    sysroot = "/opt/manylinux/2014/aarch64",
     target_cpu = "aarch64",
     target_full_name = "aarch64-linux-gnu",
 )
diff --git a/toolchain/toolchains.bazelrc b/toolchain/toolchains.bazelrc
index 908a26e12ea0..30784b9bea9d 100644
--- a/toolchain/toolchains.bazelrc
+++ b/toolchain/toolchains.bazelrc
@@ -1,4 +1,5 @@
 build:cross_config --crosstool_top=//toolchain:clang_suite
+build:cross_config --//toolchain:release=true
 build:cross_config --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
 
 build:linux-aarch_64 --config=cross_config --cpu=linux-aarch_64