fix build (#6707)

* Automator: update envoy@ in istio/proxy@master

* fix build

* fix build

---------

Co-authored-by: istio-testing <[email protected]>

Author: zirain

.bazelrc

@@ -14,7 +14,7 @@ build:remote --remote_timeout=7200
 # ========================================
 
 # Enable libc++ and C++20 by default.
-build:linux --config=clang
+build:linux --config=clang-local
 
 # put /usr/local/bin before /usr/bin to avoid picking up wrong python3.6 when building envoy.tls.key_providers.cryptomb
 build:linux --action_env=PATH=/usr/lib/llvm/bin:/usr/local/bin:/bin:/usr/bin

WORKSPACE

@@ -22,10 +22,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # 1. Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/$COMMIT.tar.gz && sha256sum $COMMIT.tar.gz`
 # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
 #
-# Commit date: 2025-11-26
-ENVOY_SHA = "fe7ddb0d48ffad87906c09559c650312a8a82efd"
+# Commit date: 2025-11-27
+ENVOY_SHA = "57469de24a75381b2a5a337c6b300d2633438352"
 
-ENVOY_SHA256 = "f6c9b829a51521dfd42ea9a7d38d6aabe4b215be7a420affa5520e139aeba496"
+ENVOY_SHA256 = "0fd6526ff532bc87981522c0f0ee44c7b5a515ad83d8bc8c437a8a46677e2c90"
 
 ENVOY_ORG = "envoyproxy"
 
@@ -54,10 +54,6 @@ load("@envoy//bazel:api_repositories.bzl", "envoy_api_dependencies")
 
 envoy_api_dependencies()
 
-load("@envoy//bazel:repo.bzl", "envoy_repo")
-
-envoy_repo()
-
 load("@envoy//bazel:repositories.bzl", "envoy_dependencies")
 
 envoy_dependencies()
@@ -81,3 +77,11 @@ install_deps()
 load("@envoy//bazel:dependency_imports.bzl", "envoy_dependency_imports")
 
 envoy_dependency_imports()
+
+load("@envoy//bazel:repo.bzl", "envoy_repo")
+
+envoy_repo()
+
+load("@envoy//bazel:toolchains.bzl", "envoy_toolchains")
+
+envoy_toolchains()

envoy.bazelrc

@@ -98,7 +98,6 @@ build:linux --cxxopt=-fsized-deallocation --host_cxxopt=-fsized-deallocation
 build:linux --conlyopt=-fexceptions
 build:linux --fission=dbg,opt
 build:linux --features=per_object_debug_info
-build:linux --action_env=BAZEL_LINKLIBS=-l%:libstdc++.a
 build:linux --action_env=BAZEL_LINKOPTS=-lm:-fuse-ld=gold
 
 # macOS
@@ -113,15 +112,20 @@ build:macos --cxxopt=-Wno-nullability-completeness
 #############################################################################
 
 # Common flags for Clang (shared between all clang variants)
-common:clang-common --action_env=BAZEL_COMPILER=clang
 common:clang-common --linkopt=-fuse-ld=lld
+common:clang-common --action_env=BAZEL_COMPILER=clang
+common:clang-common --action_env=LDFLAGS="-fuse-ld=lld"
 common:clang-common --action_env=CC=clang --host_action_env=CC=clang
 common:clang-common --action_env=CXX=clang++ --host_action_env=CXX=clang++
 
 # Clang with libc++ (default)
 common:clang --config=clang-common
 common:clang --config=libc++
-common:clang --action_env=LDFLAGS="-fuse-ld=lld"
+common:clang --host_platform=@clang_platform
+
+# Clang installed to non-standard location (ie not /opt/llvm/)
+common:clang-local --config=clang-common
+common:clang-local --config=libc++
 
 # Use gold linker for gcc compiler.
 build:gcc --config=libstdc++
@@ -141,8 +145,9 @@ build:gcc --cxxopt=-Wno-missing-requires
 build:gcc --cxxopt=-Wno-dangling-reference
 build:gcc --cxxopt=-Wno-nonnull-compare
 build:gcc --linkopt=-fuse-ld=gold --host_linkopt=-fuse-ld=gold
+build:gcc --host_platform=@envoy//bazel/rbe/toolchains:rbe_linux_gcc_platform
 
-# libc++ default for clang
+# libc++ - default for clang
 common:libc++ --action_env=CXXFLAGS=-stdlib=libc++
 common:libc++ --action_env=LDFLAGS="-stdlib=libc++ -fuse-ld=lld"
 common:libc++ --action_env=BAZEL_CXXOPTS=-stdlib=libc++
@@ -152,6 +157,7 @@ common:libc++ --define force_libcpp=enabled
 common:libc++ --@envoy//bazel:libc++=true
 
 # libstdc++ - currently only used for gcc
+build:libstdc++ --action_env=BAZEL_LINKLIBS=-l%:libstdc++.a
 build:libstdc++ --@envoy//bazel:libc++=false
 build:libstdc++ --@envoy//bazel:libstdc++=true
 
@@ -383,31 +389,11 @@ build:sizeopt -c opt --copt -Os
 # remote: Setup for cache, BES, RBE, and Docker workers
 #############################################################################
 
-# Remote execution: https://docs.bazel.build/versions/master/remote-execution.html
-build:rbe-toolchain --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
-
-build:rbe-toolchain-clang --config=rbe-toolchain
-build:rbe-toolchain-clang --config=clang
-build:rbe-toolchain-clang --platforms=@clang_platform
-build:rbe-toolchain-clang --host_platform=@clang_platform
-build:rbe-toolchain-clang --crosstool_top=@envoy//bazel/rbe/toolchains/configs/linux/clang/cc:toolchain
-
-build:rbe-toolchain-gcc --config=rbe-toolchain
-build:rbe-toolchain-gcc --config=gcc
-build:rbe-toolchain-gcc --platforms=@envoy//bazel/rbe/toolchains:rbe_linux_gcc_platform
-build:rbe-toolchain-gcc --host_platform=@envoy//bazel/rbe/toolchains:rbe_linux_gcc_platform
-build:rbe-toolchain-gcc --crosstool_top=@envoy//bazel/rbe/toolchains/configs/linux/gcc/cc:toolchain
-
-build:remote-clang --config=remote
-build:remote-clang --config=rbe-toolchain-clang
-
-build:remote-gcc --config=remote
-build:remote-gcc --config=rbe-toolchain-gcc
-
 build:remote --spawn_strategy=remote,sandboxed,local
 build:remote --strategy=Javac=remote,sandboxed,local
 build:remote --strategy=Closure=remote,sandboxed,local
 build:remote --strategy=Genrule=remote,sandboxed,local
+build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
 
 ## RBE (Engflow Envoy)
 
@@ -447,22 +433,21 @@ build:docker-sandbox --experimental_docker_verbose
 build:docker-sandbox --experimental_enable_docker_sandbox
 
 build:docker-clang --config=docker-sandbox
-build:docker-clang --config=rbe-toolchain-clang
+build:docker-clang --config=clang
 
 build:docker-gcc --config=docker-sandbox
 build:docker-gcc --config=gcc
-build:docker-gcc --config=rbe-toolchain-gcc
 
 build:docker-asan --config=docker-sandbox
-build:docker-asan --config=rbe-toolchain-clang
+build:docker-asan --config=clang
 build:docker-asan --config=asan
 
 build:docker-msan --config=docker-sandbox
-build:docker-msan --config=rbe-toolchain-clang
+build:docker-msan --config=clang
 build:docker-msan --config=msan
 
 build:docker-tsan --config=docker-sandbox
-build:docker-tsan --config=rbe-toolchain-clang
+build:docker-tsan --config=clang
 build:docker-tsan --config=tsan