From 983f0c1c46dcaedfb9bb47a8e18d6daf0127b359 Mon Sep 17 00:00:00 2001 From: Michael Achenbach Date: Tue, 19 Jul 2022 20:58:02 +0200 Subject: [PATCH] [google_benchmark] Suppress -Wdeprecated-declarations This ports: https://crrev.com/c/3773795 Bug: chromium:1344570, chromium:1345621 Change-Id: Ie3f8019a259f66900ea6dda878040edec20d4f38 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3773777 Reviewed-by: Nico Weber Auto-Submit: Michael Achenbach Commit-Queue: Nico Weber Commit-Queue: Michael Achenbach Cr-Commit-Position: refs/heads/main@{#81831} --- third_party/google_benchmark/BUILD.gn | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/third_party/google_benchmark/BUILD.gn b/third_party/google_benchmark/BUILD.gn index 123ea36bf8..e2fe35a329 100644 --- a/third_party/google_benchmark/BUILD.gn +++ b/third_party/google_benchmark/BUILD.gn @@ -11,11 +11,12 @@ if (v8_enable_google_benchmark) { "src/include", "precompiled_headers", ] - if (is_win) { - # TODO(https://crbug.com/1345621): Remove when google benchmark dropped the - # deprecated declarations. - cflags = ["-Wno-deprecated-declarations"] - } + } + + # TODO(crbug.com/1344570): Remove once third_party/google_benchmark no longer + # uses std::wstring_convert. + config("benchmark_suppress_warnings") { + cflags = ["-Wno-deprecated-declarations"] } source_set("google_benchmark") { @@ -69,6 +70,10 @@ if (v8_enable_google_benchmark) { all_dependent_configs = [ ":benchmark_config" ] + configs += [ + ":benchmark_suppress_warnings", + ] + defines = [ # Tell google_benchmark to always use standard regular expressions. "HAVE_GNU_POSIX_REGEX=0",