Skip to content

Commit 411f9de

Browse files
committed
update googlebenchmark to v1.9.1-22-g4a805f9
Fixes `-Winvalid-offset` warning (treated as an error) when building with clang 18.1.8 from Visual Studio 2022 17.12.4: FAILED: deps/googlebenchmark/src/CMakeFiles/benchmark.dir/Debug/benchmark.cc.obj ... .../googlebenchmark-source/src/benchmark.cc:191:17: error: offset of on non-standard-layout type 'State' [-Werror,-Winvalid-offsetof] 191 | static_assert(offsetof(State, error_occurred_) <= | ^ ~~~~~~~~~~~~~~~ ...\clang\18\include\__stddef_offsetof.h:16:24: note: expanded from macro 'offsetof' 16 | #define offsetof(t, d) __builtin_offsetof(t, d) | Earlier issues with Android builds were fixed in: 7702e72 scripts/build-android-*.sh: bump ANDROID_PLATFORM to 24 PiperOrigin-RevId: 722840056
1 parent 7702e72 commit 411f9de

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ http_archive(
5151
# Google Benchmark library, used in micro-benchmarks.
5252
http_archive(
5353
name = "com_google_benchmark",
54-
sha256 = "1ba14374fddcd9623f126b1a60945e4deac4cdc4fb25a5f25e7f779e36f2db52",
55-
strip_prefix = "benchmark-d2a8a4ee41b923876c034afb939c4fc03598e622",
56-
urls = ["https://github.com/google/benchmark/archive/d2a8a4ee41b923876c034afb939c4fc03598e622.zip"],
54+
sha256 = "a3f2e783628cee5b75166cb02af43fd1220479553c397ba4a35abd1d19d19ad3",
55+
strip_prefix = "benchmark-4a805f9f0f468bd4d499d060a1a1c6bd5d6b6b73",
56+
urls = ["https://github.com/google/benchmark/archive/4a805f9f0f468bd4d499d060a1a1c6bd5d6b6b73.zip"],
5757
)
5858
# LINT.ThenChange(cmake/DownloadGoogleBenchmark.cmake,WORKSPACE:benchmark)
5959

WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ http_archive(
6565
# Google Benchmark library, used in micro-benchmarks.
6666
http_archive(
6767
name = "com_google_benchmark",
68-
sha256 = "1ba14374fddcd9623f126b1a60945e4deac4cdc4fb25a5f25e7f779e36f2db52",
69-
strip_prefix = "benchmark-d2a8a4ee41b923876c034afb939c4fc03598e622",
70-
urls = ["https://github.com/google/benchmark/archive/d2a8a4ee41b923876c034afb939c4fc03598e622.zip"],
68+
sha256 = "a3f2e783628cee5b75166cb02af43fd1220479553c397ba4a35abd1d19d19ad3",
69+
strip_prefix = "benchmark-4a805f9f0f468bd4d499d060a1a1c6bd5d6b6b73",
70+
urls = ["https://github.com/google/benchmark/archive/4a805f9f0f468bd4d499d060a1a1c6bd5d6b6b73.zip"],
7171
)
7272
# LINT.ThenChange(cmake/DownloadGoogleBenchmark.cmake,MODULE.bazel:benchmark)
7373

cmake/DownloadGoogleBenchmark.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ ENDIF()
1818
# LINT.IfChange
1919
INCLUDE(ExternalProject)
2020
ExternalProject_Add(googlebenchmark
21-
URL https://github.com/google/benchmark/archive/d2a8a4ee41b923876c034afb939c4fc03598e622.zip
22-
URL_HASH SHA256=1ba14374fddcd9623f126b1a60945e4deac4cdc4fb25a5f25e7f779e36f2db52
21+
URL https://github.com/google/benchmark/archive/4a805f9f0f468bd4d499d060a1a1c6bd5d6b6b73.zip
22+
URL_HASH SHA256=a3f2e783628cee5b75166cb02af43fd1220479553c397ba4a35abd1d19d19ad3
2323
SOURCE_DIR "${CMAKE_BINARY_DIR}/googlebenchmark-source"
2424
BINARY_DIR "${CMAKE_BINARY_DIR}/googlebenchmark"
2525
CONFIGURE_COMMAND ""

0 commit comments

Comments
 (0)