diff options
| -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 |