Skip to content

Commit 53a673d

Browse files
committed
Automator: update envoy@ in istio/proxy@master
1 parent 8663c2c commit 53a673d

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2222
# 1. Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/$COMMIT.tar.gz && sha256sum $COMMIT.tar.gz`
2323
# 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
2424
#
25-
# Commit date: 2025-12-02
26-
ENVOY_SHA = "44b00e0264cfcdbbc593998a407b3f957ec28c77"
25+
# Commit date: 2025-12-05
26+
ENVOY_SHA = "b34c60c66241bbbc529735895e4c88de859aadd1"
2727

28-
ENVOY_SHA256 = "1c8bc33cf9b758604042212d69d8bc37f41991facc43ed139d070b6b94aeddb0"
28+
ENVOY_SHA256 = "c5e2b7e3f8149c8d3548ea52348736715bcbdec66c408fd72aec22c232c95392"
2929

3030
ENVOY_ORG = "envoyproxy"
3131

envoy.bazelrc

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ build --incompatible_merge_fixed_and_default_shell_env
4545
# A workaround for slow ICU download.
4646
build --http_timeout_scaling=6.0
4747

48-
# Pass CC, CXX and LLVM_CONFIG variables from the environment.
49-
# We assume they have stable values, so this won't cause action cache misses.
50-
build --action_env=CC --host_action_env=CC
51-
build --action_env=CXX --host_action_env=CXX
52-
build --action_env=LLVM_CONFIG --host_action_env=LLVM_CONFIG
53-
5448
# Allow stamped caches to bust when local filesystem changes.
5549
# Requires setting `BAZEL_VOLATILE_DIRTY` in the env.
5650
build --action_env=BAZEL_VOLATILE_DIRTY --host_action_env=BAZEL_VOLATILE_DIRTY
@@ -99,13 +93,14 @@ build:linux --cxxopt=-fsized-deallocation --host_cxxopt=-fsized-deallocation
9993
build:linux --conlyopt=-fexceptions
10094
build:linux --fission=dbg,opt
10195
build:linux --features=per_object_debug_info
102-
build:linux --action_env=BAZEL_LINKOPTS=-lm:-fuse-ld=gold
10396

10497
# macOS
10598
build:macos --action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin
10699
build:macos --host_action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin
107100
build:macos --define tcmalloc=disabled
108101
build:macos --cxxopt=-Wno-nullability-completeness
102+
build:macos --@toolchains_llvm//toolchain/config:compiler-rt=false
103+
build:macos --@toolchains_llvm//toolchain/config:libunwind=false
109104

110105

111106
#############################################################################
@@ -114,15 +109,14 @@ build:macos --cxxopt=-Wno-nullability-completeness
114109

115110
# Common flags for Clang (shared between all clang variants)
116111
common:clang-common --linkopt=-fuse-ld=lld
117-
common:clang-common --action_env=BAZEL_COMPILER=clang
118-
common:clang-common --action_env=LDFLAGS="-fuse-ld=lld"
119-
common:clang-common --action_env=CC=clang --host_action_env=CC=clang
120-
common:clang-common --action_env=CXX=clang++ --host_action_env=CXX=clang++
112+
common:clang-common --@toolchains_llvm//toolchain/config:compiler-rt=false
113+
common:clang-common --@toolchains_llvm//toolchain/config:libunwind=false
121114

122115
# Clang with libc++ (default)
123116
common:clang --config=clang-common
124117
common:clang --config=libc++
125118
common:clang --host_platform=@clang_platform
119+
common:clang --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
126120

127121
# Clang installed to non-standard location (ie not /opt/llvm/)
128122
common:clang-local --config=clang-common
@@ -147,6 +141,8 @@ build:gcc --cxxopt=-Wno-dangling-reference
147141
build:gcc --cxxopt=-Wno-nonnull-compare
148142
build:gcc --linkopt=-fuse-ld=gold --host_linkopt=-fuse-ld=gold
149143
build:gcc --host_platform=@envoy//bazel/rbe/toolchains:rbe_linux_gcc_platform
144+
build:gcc --linkopt=-fuse-ld=gold --host_linkopt=-fuse-ld=gold
145+
build:gcc --action_env=BAZEL_LINKOPTS=-lm:-fuse-ld=gold
150146

151147
# libc++ - default for clang
152148
common:libc++ --action_env=CXXFLAGS=-stdlib=libc++
@@ -395,6 +391,9 @@ build:remote --strategy=Javac=remote,sandboxed,local
395391
build:remote --strategy=Closure=remote,sandboxed,local
396392
build:remote --strategy=Genrule=remote,sandboxed,local
397393
build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
394+
# This flag may be more generally useful - it sets foreign_cc builds -jauto.
395+
# It is only set here because if it were the default it risks OOMing on local builds.
396+
build:remote --@envoy//bazel/foreign_cc:parallel_builds
398397

399398
## RBE (Engflow Envoy)
400399

0 commit comments

Comments
 (0)