Skip to content

Commit eda8939

Browse files
eric846asingh-g
authored andcommitted
Update Envoy to 9ceb376 (Jun 19, 2025) (#1372)
- Major .bazelrc update after envoyproxy/envoy#39755 - Not taking the upstream update `build:linux --action_env=BAZEL_LINKOPTS=-lm:-fuse-ld=gold` which breaks my local `ci/do_ci.sh build` with `clang-18: error: invalid linker name in argument '-fuse-ld=gold'` - `Http1PoolImpl` started taking an `OverloadManager` argument; created a `NullOverloadManager` in `NighthawkServerInstance` to be used for that Signed-off-by: eric846 <56563761+eric846@users.noreply.github.com> Signed-off-by: asingh-g <abhisinghx@google.com>
1 parent 77619da commit eda8939

File tree

1 file changed

+6
-117
lines changed

1 file changed

+6
-117
lines changed

.bazelrc

Lines changed: 6 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
# unique
55
build:asan --test_timeout=900 # unique
66
build:tsan --test_timeout=900 # unique
7-
build:asan --test_timeout=900 # unique
8-
build:tsan --test_timeout=900 # unique
97
# See https://github.com/envoyproxy/nighthawk/issues/405 # unique
108
build:macos --copt -UDEBUG # unique
119
# unique
@@ -34,14 +32,12 @@ build --incompatible_strict_action_env
3432
build --java_runtime_version=remotejdk_11
3533
build --tool_java_runtime_version=remotejdk_11
3634
# build --platform_mappings="" # unique
35+
# build --platform_mappings="" # unique
3736
# silence absl logspam.
3837
build --copt=-DABSL_MIN_LOG_LEVEL=4
3938
# Global C++ standard and common warning suppressions
4039
build --cxxopt=-std=c++20 --host_cxxopt=-std=c++20
4140
build --copt=-Wno-deprecated-declarations
42-
# Global C++ standard and common warning suppressions
43-
build --cxxopt=-std=c++20 --host_cxxopt=-std=c++20
44-
build --copt=-Wno-deprecated-declarations
4541
build --define envoy_mobile_listener=enabled
4642
build --experimental_repository_downloader_retries=2
4743
build --enable_platform_specific_config
@@ -62,10 +58,6 @@ build --action_env=LLVM_CONFIG --host_action_env=LLVM_CONFIG
6258
# rbe-toolchain-clang that Envoy builds. # unique
6359
# This value is the same for different VMs, thus cache hits can be shared among machines. # unique
6460
build --host_action_env=PATH=/usr/sbin:/usr/bin:/opt/llvm/bin # unique
65-
# Explicitly set the --host_action_env for clang build since we are not building # unique
66-
# rbe-toolchain-clang that Envoy builds. # unique
67-
# This value is the same for different VMs, thus cache hits can be shared among machines. # unique
68-
build --host_action_env=PATH=/usr/sbin:/usr/bin:/opt/llvm/bin # unique
6961
# To make our own CI green, we do need that flag on Windows though.
7062
build:windows --action_env=PATH --host_action_env=PATH
7163

@@ -87,6 +79,9 @@ test --experimental_ui_max_stdouterr_bytes=11712829 #default 1048576
8779
# Allow tags to influence execution requirements
8880
common --experimental_allow_tags_propagation
8981

82+
# Test configuration flags # unique
83+
# Enable stress tests (expensive tests that are skipped by default) # unique
84+
test:stress --//test/config:run_stress_tests=True # unique
9085
# Test configuration flags # unique
9186
# Enable stress tests (expensive tests that are skipped by default) # unique
9287
test:stress --//test/config:run_stress_tests=True # unique
@@ -101,7 +96,6 @@ build:linux --fission=dbg,opt
10196
build:linux --features=per_object_debug_info
10297
build:linux --action_env=BAZEL_LINKLIBS=-l%:libstdc++.a
10398
build:linux --action_env=BAZEL_LINKOPTS=-lm # unique
104-
build:linux --action_env=BAZEL_LINKOPTS=-lm # unique
10599

106100
# We already have absl in the build, define absl=1 to tell googletest to use absl for backtrace.
107101
build --define absl=1
@@ -124,18 +118,6 @@ build:clang-common --incompatible_enable_cc_toolchain_resolution=false
124118
build:clang --config=clang-common
125119
build:clang --config=libc++
126120

127-
build:arm64-clang --config=clang
128-
# Common flags for Clang (shared between all clang variants)
129-
build:clang-common --action_env=BAZEL_COMPILER=clang
130-
build:clang-common --linkopt=-fuse-ld=lld
131-
build:clang-common --action_env=CC=clang --host_action_env=CC=clang
132-
build:clang-common --action_env=CXX=clang++ --host_action_env=CXX=clang++
133-
build:clang-common --incompatible_enable_cc_toolchain_resolution=false
134-
135-
# Clang with libc++ (default)
136-
build:clang --config=clang-common
137-
build:clang --config=libc++
138-
139121
build:arm64-clang --config=clang
140122

141123
# Flags for Clang + PCH
@@ -146,13 +128,8 @@ build:clang-pch --define=ENVOY_CLANG_PCH=1
146128
build:libstdc++ --@envoy//bazel:libc++=false
147129
build:libstdc++ --@envoy//bazel:libstdc++=true
148130

149-
# libstdc++ - currently only used for gcc
150-
build:libstdc++ --@envoy//bazel:libc++=false
151-
build:libstdc++ --@envoy//bazel:libstdc++=true
152-
153131
# Use gold linker for gcc compiler.
154132
build:gcc --config=libstdc++
155-
build:gcc --config=libstdc++
156133
build:gcc --test_env=HEAPCHECK=
157134
build:gcc --action_env=BAZEL_COMPILER=gcc
158135
build:gcc --action_env=CC=gcc --action_env=CXX=g++
@@ -170,7 +147,6 @@ build:gcc --cxxopt=-Wno-dangling-reference
170147
build:gcc --cxxopt=-Wno-nonnull-compare
171148
build:gcc --incompatible_enable_cc_toolchain_resolution=false
172149
build:gcc --linkopt=-fuse-ld=gold --host_linkopt=-fuse-ld=gold
173-
build:gcc --linkopt=-fuse-ld=gold --host_linkopt=-fuse-ld=gold
174150

175151
# Clang-tidy
176152
# TODO(phlax): enable this, its throwing some errors as well as finding more issues
@@ -180,19 +156,13 @@ build:clang-tidy --aspects @envoy_toolshed//format/clang_tidy:clang_tidy.bzl%cla
180156
build:clang-tidy --output_groups=report
181157
build:clang-tidy --build_tag_filters=-notidy
182158

183-
# Basic ASAN/UBSAN that works for gcc or llvm
184-
build:asan-common --config=sanitizer
185159
# Basic ASAN/UBSAN that works for gcc or llvm
186160
build:asan-common --config=sanitizer
187161
# ASAN install its signal handler, disable ours so the stacktrace will be printed by ASAN
188162
build:asan-common --define signal_trace=disabled
189163
build:asan-common --define ENVOY_CONFIG_ASAN=1
190164
build:asan-common --build_tag_filters=-no_san
191165
build:asan-common --test_tag_filters=-no_san
192-
build:asan-common --define signal_trace=disabled
193-
build:asan-common --define ENVOY_CONFIG_ASAN=1
194-
build:asan-common --build_tag_filters=-no_san
195-
build:asan-common --test_tag_filters=-no_san
196166
# The following two lines were manually edited due to #593. # unique
197167
# Flag undefined was dropped from both the lines to allow CI/ASAN to pass. # unique
198168
build:asan-common --copt -fsanitize=address # unique
@@ -206,33 +176,10 @@ build:asan-common --copt -D__SANITIZE_ADDRESS__
206176
build:asan-common --test_env=ASAN_OPTIONS=handle_abort=1:allow_addr2line=true:check_initialization_order=true:strict_init_order=true:detect_odr_violation=1
207177
build:asan-common --test_env=UBSAN_OPTIONS=halt_on_error=true:print_stacktrace=1
208178
build:asan-common --test_env=ASAN_SYMBOLIZER_PATH
209-
build:asan-common --copt -fsanitize=address # unique
210-
build:asan-common --linkopt -fsanitize=address # unique
211-
# vptr and function sanitizer are enabled in asan if it is set up via bazel/setup_clang.sh.
212-
build:asan-common --copt -fno-sanitize=vptr,function
213-
build:asan-common --linkopt -fno-sanitize=vptr,function
214-
build:asan-common --copt -DADDRESS_SANITIZER=1
215-
build:asan-common --copt -DUNDEFINED_SANITIZER=1
216-
build:asan-common --copt -D__SANITIZE_ADDRESS__
217-
build:asan-common --test_env=ASAN_OPTIONS=handle_abort=1:allow_addr2line=true:check_initialization_order=true:strict_init_order=true:detect_odr_violation=1
218-
build:asan-common --test_env=UBSAN_OPTIONS=halt_on_error=true:print_stacktrace=1
219-
build:asan-common --test_env=ASAN_SYMBOLIZER_PATH
220179
# ASAN needs -O1 to get reasonable performance.
221180
build:asan-common --copt -O1
222181
build:asan-common --copt -fno-optimize-sibling-calls
223-
build:asan-common --copt -O1
224-
build:asan-common --copt -fno-optimize-sibling-calls
225182

226-
# ASAN config with clang runtime
227-
build:asan --config=asan-common
228-
build:asan --linkopt --rtlib=compiler-rt
229-
build:asan --linkopt --unwindlib=libgcc
230-
build:asan --linkopt=-l:libclang_rt.ubsan_standalone.a
231-
build:asan --linkopt=-l:libclang_rt.ubsan_standalone_cxx.a
232-
build:asan --action_env=ENVOY_UBSAN_VPTR=1
233-
build:asan --copt=-fsanitize=vptr,function
234-
build:asan --linkopt=-fsanitize=vptr,function
235-
build:asan --linkopt='-L/opt/llvm/lib/clang/18/lib/x86_64-unknown-linux-gnu'
236183
# ASAN config with clang runtime
237184
build:asan --config=asan-common
238185
build:asan --linkopt --rtlib=compiler-rt
@@ -259,15 +206,6 @@ build:macos-asan --copt -DGRPC_BAZEL_BUILD
259206
# Dynamic link cause issues like: `dyld: malformed mach-o: load commands size (59272) > 32768`
260207
build:macos-asan --dynamic_mode=off
261208

262-
# Base TSAN config
263-
build:tsan --action_env=ENVOY_TSAN=1
264-
build:tsan --config=sanitizer
265-
build:tsan --define ENVOY_CONFIG_TSAN=1
266-
build:tsan --copt -fsanitize=thread
267-
build:tsan --linkopt -fsanitize=thread
268-
build:tsan --copt -DTHREAD_SANITIZER=1
269-
build:tsan --build_tag_filters=-no_san,-no_tsan
270-
build:tsan --test_tag_filters=-no_san,-no_tsan
271209
# Base TSAN config
272210
build:tsan --action_env=ENVOY_TSAN=1
273211
build:tsan --config=sanitizer
@@ -279,25 +217,11 @@ build:tsan --build_tag_filters=-no_san,-no_tsan
279217
build:tsan --test_tag_filters=-no_san,-no_tsan
280218
# Needed due to https://github.com/libevent/libevent/issues/777
281219
build:tsan --copt -DEVENT__DISABLE_DEBUG_MODE
282-
build:tsan --copt -DEVENT__DISABLE_DEBUG_MODE
283220
# https://github.com/abseil/abseil-cpp/issues/760
284221
# https://github.com/google/sanitizers/issues/953
285222
build:tsan --test_env="TSAN_OPTIONS=report_atomic_races=0"
286223
build:tsan --test_timeout=120,600,1500,4800
287-
build:tsan --test_env="TSAN_OPTIONS=report_atomic_races=0"
288-
build:tsan --test_timeout=120,600,1500,4800
289224

290-
# Base MSAN config
291-
build:msan --action_env=ENVOY_MSAN=1
292-
build:msan --config=sanitizer
293-
build:msan --build_tag_filters=-no_san
294-
build:msan --test_tag_filters=-no_san
295-
build:msan --define ENVOY_CONFIG_MSAN=1
296-
build:msan --copt -fsanitize=memory
297-
build:msan --linkopt -fsanitize=memory
298-
build:msan --copt -fsanitize-memory-track-origins=2
299-
build:msan --copt -DMEMORY_SANITIZER=1
300-
build:msan --test_env=MSAN_SYMBOLIZER_PATH
301225
# Base MSAN config
302226
build:msan --action_env=ENVOY_MSAN=1
303227
build:msan --config=sanitizer
@@ -312,8 +236,6 @@ build:msan --test_env=MSAN_SYMBOLIZER_PATH
312236
# MSAN needs -O1 to get reasonable performance.
313237
build:msan --copt -O1
314238
build:msan --copt -fno-optimize-sibling-calls
315-
build:msan --copt -O1
316-
build:msan --copt -fno-optimize-sibling-calls
317239

318240
build:libc++ --action_env=CXXFLAGS=-stdlib=libc++
319241
build:libc++ --action_env=LDFLAGS=-stdlib=libc++
@@ -325,10 +247,6 @@ build:libc++ --@envoy//bazel:libc++=true
325247

326248

327249

328-
build:libc++ --@envoy//bazel:libc++=true
329-
330-
331-
332250

333251
# Optimize build for binary size reduction.
334252
build:sizeopt -c opt --copt -Os
@@ -378,7 +296,6 @@ build:fuzz-coverage --test_tag_filters=-nocoverage
378296
# resources required to build and run the tests.
379297
build:fuzz-coverage --define=wasm=disabled
380298
build:fuzz-coverage --config=fuzz-coverage-config
381-
build:fuzz-coverage --config=fuzz-coverage-config
382299
build:fuzz-coverage-config --//tools/coverage:config=//test:fuzz_coverage_config
383300

384301
build:cache-local --remote_cache=grpc://localhost:9092
@@ -389,7 +306,6 @@ build:rbe-toolchain --incompatible_enable_cc_toolchain_resolution=false
389306

390307
build:rbe-toolchain-clang --config=rbe-toolchain
391308
build:rbe-toolchain-clang --config=clang
392-
build:rbe-toolchain-clang --config=clang
393309
build:rbe-toolchain-clang --platforms=@envoy//bazel/rbe/toolchains:rbe_linux_clang_platform
394310
build:rbe-toolchain-clang --host_platform=@envoy//bazel/rbe/toolchains:rbe_linux_clang_platform
395311
build:rbe-toolchain-clang --crosstool_top=@envoy//bazel/rbe/toolchains/configs/linux/clang/cc:toolchain
@@ -406,18 +322,6 @@ build:rbe-toolchain-arm64-clang --extra_toolchains=@envoy//bazel/rbe/toolchains/
406322
build:rbe-toolchain-arm64-clang --action_env=CC=clang --action_env=CXX=clang++
407323

408324

409-
# Sanitizer configs - CI uses the *-common configs directly
410-
# Note: clang config comes from rbe-toolchain-clang to avoid duplication
411-
412-
build:rbe-toolchain-arm64-clang --config=rbe-toolchain
413-
build:rbe-toolchain-arm64-clang --config=clang
414-
build:rbe-toolchain-arm64-clang --platforms=@envoy//bazel/rbe/toolchains:rbe_linux_arm64_clang_platform
415-
build:rbe-toolchain-arm64-clang --host_platform=@envoy//bazel/rbe/toolchains:rbe_linux_arm64_clang_platform
416-
build:rbe-toolchain-arm64-clang --crosstool_top=@envoy//bazel/rbe/toolchains/configs/linux/clang/cc:toolchain
417-
build:rbe-toolchain-arm64-clang --extra_toolchains=@envoy//bazel/rbe/toolchains/configs/linux/clang/config:cc-toolchain-arm64
418-
build:rbe-toolchain-arm64-clang --action_env=CC=clang --action_env=CXX=clang++
419-
420-
421325
# Sanitizer configs - CI uses the *-common configs directly
422326
# Note: clang config comes from rbe-toolchain-clang to avoid duplication
423327

@@ -460,20 +364,14 @@ build:remote-gcc --config=rbe-toolchain-gcc
460364
build:remote-asan --config=remote
461365
build:remote-asan --config=rbe-toolchain-clang
462366
build:remote-asan --config=asan
463-
build:remote-asan --config=rbe-toolchain-clang
464-
build:remote-asan --config=asan
465367

466368
build:remote-msan --config=remote
467369
build:remote-msan --config=rbe-toolchain-clang
468370
build:remote-msan --config=msan
469-
build:remote-msan --config=rbe-toolchain-clang
470-
build:remote-msan --config=msan
471371

472372
build:remote-tsan --config=remote
473373
build:remote-tsan --config=rbe-toolchain-clang
474374
build:remote-tsan --config=tsan
475-
build:remote-tsan --config=rbe-toolchain-clang
476-
build:remote-tsan --config=tsan
477375

478376
build:remote-msvc-cl --config=remote-windows
479377
build:remote-msvc-cl --config=msvc-cl
@@ -499,8 +397,6 @@ build:compile-time-options --define=zlib=ng
499397
build:compile-time-options --define=uhv=enabled
500398
# gRPC has a lot of deprecated-enum-enum-conversion warnings with C++20
501399
build:compile-time-options --copt=-Wno-error=deprecated-enum-enum-conversion
502-
# gRPC has a lot of deprecated-enum-enum-conversion warnings with C++20
503-
build:compile-time-options --copt=-Wno-error=deprecated-enum-enum-conversion
504400
build:compile-time-options --test_env=ENVOY_HAS_EXTRA_EXTENSIONS=true
505401
build:compile-time-options --@envoy//bazel:http3=False
506402
build:compile-time-options --@envoy//source/extensions/filters/http/kill_request:enabled
@@ -527,25 +423,21 @@ build:docker-gcc --config=rbe-toolchain-gcc
527423
build:docker-asan --config=docker-sandbox
528424
build:docker-asan --config=rbe-toolchain-clang
529425
build:docker-asan --config=asan
530-
build:docker-asan --config=rbe-toolchain-clang
531-
build:docker-asan --config=asan
532426

533427
build:docker-msan --config=docker-sandbox
534428
build:docker-msan --config=rbe-toolchain-clang
535429
build:docker-msan --config=msan
536-
build:docker-msan --config=rbe-toolchain-clang
537-
build:docker-msan --config=msan
538430

539431
build:docker-tsan --config=docker-sandbox
540432
build:docker-tsan --config=rbe-toolchain-clang
541433
build:docker-tsan --config=tsan
542-
build:docker-tsan --config=rbe-toolchain-clang
543-
build:docker-tsan --config=tsan
544434

545435
# CI configurations
546436
build:remote-ci --config=ci
547437
build:remote-ci --remote_download_minimal
548438

439+
build:remote-ci-download --config=ci # unique
440+
build:remote-ci-download --remote_download_toplevel # unique
549441
build:remote-ci-download --config=ci # unique
550442
build:remote-ci-download --remote_download_toplevel # unique
551443

@@ -569,19 +461,16 @@ build:plain-fuzzer --define=FUZZING_ENGINE=libfuzzer
569461
build:plain-fuzzer --copt=-fsanitize=fuzzer-no-link
570462
build:plain-fuzzer --linkopt=-fsanitize=fuzzer-no-link
571463

572-
# ASAN fuzzer
573464
# ASAN fuzzer
574465
build:asan-fuzzer --config=plain-fuzzer
575466
build:asan-fuzzer --config=asan
576-
build:asan-fuzzer --config=asan
577467
build:asan-fuzzer --copt=-fno-omit-frame-pointer
578468
# Remove UBSAN halt_on_error to avoid crashing on protobuf errors.
579469
build:asan-fuzzer --test_env=UBSAN_OPTIONS=print_stacktrace=1
580470
build:asan-fuzzer --linkopt=-lc++
581471

582472
build:oss-fuzz --config=fuzzing
583473
build:oss-fuzz --config=libc++
584-
build:oss-fuzz --config=libc++
585474
build:oss-fuzz --define=FUZZING_ENGINE=oss-fuzz
586475
build:oss-fuzz --@rules_fuzzing//fuzzing:cc_engine_instrumentation=oss-fuzz
587476
build:oss-fuzz --@rules_fuzzing//fuzzing:cc_engine_sanitizer=none

0 commit comments

Comments
 (0)