--- ./engine/src/build/config/BUILDCONFIG.gn.orig +++ ./engine/src/build/config/BUILDCONFIG.gn @@ -324,7 +324,7 @@ is_clang = true } -use_flutter_cxx = is_clang && (is_linux || is_android || is_mac || is_ios) +use_flutter_cxx = false if (is_msan && !is_linux) { assert(false, "Memory sanitizer is only available on Linux.") --- ./engine/src/flutter/third_party/flatbuffers/include/flatbuffers/util.h.orig +++ ./engine/src/flutter/third_party/flatbuffers/include/flatbuffers/util.h @@ -202,7 +202,7 @@ // clang-format off // Use locale independent functions {strtod_l, strtof_l, strtoll_l, strtoull_l}. -#if defined(FLATBUFFERS_LOCALE_INDEPENDENT) && (FLATBUFFERS_LOCALE_INDEPENDENT > 0) +#if defined(__GLIBC__) && defined(FLATBUFFERS_LOCALE_INDEPENDENT) && (FLATBUFFERS_LOCALE_INDEPENDENT > 0) class ClassicLocale { #ifdef _MSC_VER typedef _locale_t locale_type; --- ./engine/src/flutter/third_party/flatbuffers/src/util.cpp.orig +++ ./engine/src/flutter/third_party/flatbuffers/src/util.cpp @@ -252,7 +252,7 @@ } // Locale-independent code. -#if defined(FLATBUFFERS_LOCALE_INDEPENDENT) && \ +#if defined(__GLIBC__) && defined(FLATBUFFERS_LOCALE_INDEPENDENT) && \ (FLATBUFFERS_LOCALE_INDEPENDENT > 0) // clang-format off