From 6e3c300d79ea1d1c57fddbf7414c0bb8624c35bc Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Thu, 17 Feb 2022 20:38:56 +0000 Subject: [PATCH] stop defining _LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS when building libc++abi This was needed because libc++'s header omits set_unexpected() (which libcxxabi defines) if that define isn't set -- but also doesn't omit it if _LIBCPP_BUILDING_LIBRARY is defined, which it is after https://chromium-review.googlesource.com/c/chromium/src/+/3469341 No behavior change. Bug: 1298070 Change-Id: I6b289656dc9bbc3a5428ac288bda54755bcf221d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3472583 Commit-Queue: Nico Weber Auto-Submit: Nico Weber Reviewed-by: Arthur Eubanks Commit-Queue: Arthur Eubanks Cr-Commit-Position: refs/heads/main@{#972605} --- buildtools/third_party/libc++abi/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/buildtools/third_party/libc++abi/BUILD.gn b/buildtools/third_party/libc++abi/BUILD.gn index 91839cc154512..40f1285f14c08 100644 --- a/buildtools/third_party/libc++abi/BUILD.gn +++ b/buildtools/third_party/libc++abi/BUILD.gn @@ -59,7 +59,6 @@ source_set("libc++abi") { defines = [ "LIBCXXABI_SILENT_TERMINATE", - "_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS", # TODO(crbug.com/1298070) _LIBCPP_CONSTINIT is defined in a libc++ revision # more recent than the one currently used in Chromium.