system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-02 22:24:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

AK: Enable consteval workaround for Android NDK

Browse source 
Android isn't shipping clang-15 yet in any NDK, so use the existing
workaround on that platform.
This commit is contained in:
Andrew Kaster 2023-07-19 03:56:12 -06:00 committed by Andrew Kaster
parent 73a6f2e9ed
commit 3533d3e452
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
AK/String.h
View file

@ -31,7 +31,8 @@ class StringData;
// FIXME: Remove this when OpenBSD Clang fully supports consteval.
// And once oss-fuzz updates to clang >15.
#if defined(AK_OS_OPENBSD) || defined(OSS_FUZZ)
// And once Android ships an NDK with clang >14
#if defined(AK_OS_OPENBSD) || defined(OSS_FUZZ) || defined(AK_OS_ANDROID)
# define AK_SHORT_STRING_CONSTEVAL constexpr
#else
# define AK_SHORT_STRING_CONSTEVAL consteval

3
AK/StringView.h
View file

@ -376,7 +376,8 @@ struct CaseInsensitiveASCIIStringViewTraits : public Traits<StringView> {
// See: https://github.com/llvm/llvm-project/issues/48230
// Additionally, oss-fuzz currently ships an llvm-project commit that is a pre-release of 15.0.0.
// See: https://github.com/google/oss-fuzz/issues/9989
#if defined(AK_OS_BSD_GENERIC) or defined(OSS_FUZZ)
// Android currently doesn't ship clang-15 in any NDK
#if defined(AK_OS_BSD_GENERIC) || defined(OSS_FUZZ) || defined(AK_OS_ANDROID)
# define AK_STRING_VIEW_LITERAL_CONSTEVAL constexpr
#else
# define AK_STRING_VIEW_LITERAL_CONSTEVAL consteval