summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-08 04:28:04 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-08 04:28:04 +0000
commit8420cedcee0bbec82b21725966ff1fe1c63c0b82 (patch)
treea27cf37d0cbda932e117f1d44866d270eea03ef1
parent5d23335f54a3f55613ebe9a4e03b9f2a9852d4e9 (diff)
parent51d04dd9d10e9a57a87e07866e20c382c9958a32 (diff)
downloadlibchrome-android14-mainline-healthfitness-release.tar.gz
Snap for 10460766 from 51d04dd9d10e9a57a87e07866e20c382c9958a32 to mainline-healthfitness-releaseaml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030android14-mainline-healthfitness-release
Change-Id: I25dc98a47211468ce24bd2e904fc32d04daf7ee5
-rw-r--r--base/template_util.h5
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