diff options
| author | William Escande <wescande@google.com> | 2022-12-20 16:01:07 -0800 |
|---|---|---|
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2023-06-09 17:33:14 +0000 |
| commit | 51d04dd9d10e9a57a87e07866e20c382c9958a32 (patch) | |
| tree | a27cf37d0cbda932e117f1d44866d270eea03ef1 | |
| parent | 5d23335f54a3f55613ebe9a4e03b9f2a9852d4e9 (diff) | |
| download | libchrome-51d04dd9d10e9a57a87e07866e20c382c9958a32.tar.gz | |
Prevent spamming log for deprecated builtin
Bug: 263208065
Test: build
(cherry picked from https://android-review.googlesource.com/q/commit:270953b4499f462f6a880101ee61c9a0b3e1ecb5)
Merged-In: I7269fcf5a79e7e475268e3ce5f9d03a7b1b7856f
Change-Id: I7269fcf5a79e7e475268e3ce5f9d03a7b1b7856f
| -rw-r--r-- | base/template_util.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/base/template_util.h b/base/template_util.h index 8544aa2945..e4d03a24c3 100644 --- a/base/template_util.h +++ b/base/template_util.h @@ -22,8 +22,9 @@ // you attempt to mix an earlier version of libstdc++ with >= GCC5. But // that's unlikely to work out, especially as GCC5 changed ABI. #define CR_GLIBCXX_5_0_0 20150123 -#if (defined(__GNUC__) && __GNUC__ < 5) || \ - (defined(__GLIBCXX__) && __GLIBCXX__ == CR_GLIBCXX_5_0_0) +// `!defined(__clang__)` is a local android patch +#if !defined(__clang__) && ((defined(__GNUC__) && __GNUC__ < 5) || \ + (defined(__GLIBCXX__) && __GLIBCXX__ == CR_GLIBCXX_5_0_0)) #define CR_USE_FALLBACKS_FOR_OLD_EXPERIMENTAL_GLIBCXX #endif |