From 447fdb558dd95acced3ddee7cd8fb9383bb36c88 Mon Sep 17 00:00:00 2001 From: Andrew Druk Date: Mon, 25 Nov 2024 16:14:02 +0200 Subject: [PATCH] Dev: disable exit-time-destructors warnings for crashlytics --- .../swift/0008-Enable-crashlytics-and-build-ids.patch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/patches/release/5.7/swift/0008-Enable-crashlytics-and-build-ids.patch b/patches/release/5.7/swift/0008-Enable-crashlytics-and-build-ids.patch index 2ce2bc9..eb1a996 100644 --- a/patches/release/5.7/swift/0008-Enable-crashlytics-and-build-ids.patch +++ b/patches/release/5.7/swift/0008-Enable-crashlytics-and-build-ids.patch @@ -12,18 +12,21 @@ index ddfcd7e3e54..fac2247c5e9 100644 if (SWIFTLIB_BACK_DEPLOYMENT_LIBRARY) diff --git a/stdlib/public/runtime/Errors.cpp b/stdlib/public/runtime/Errors.cpp -index 26e3a01998c..a2534ffed6f 100644 +index 26e3a01998c..a53a3251c48 100644 --- a/stdlib/public/runtime/Errors.cpp +++ b/stdlib/public/runtime/Errors.cpp -@@ -55,6 +55,7 @@ +@@ -55,6 +55,10 @@ #include #elif defined(__ANDROID__) #include ++#pragma clang diagnostic push ++#pragma clang diagnostic ignored "-Wexit-time-destructors" +#include "crashlytics.h" ++#pragma clang diagnostic pop #endif #if defined(__ELF__) -@@ -315,6 +316,8 @@ reportOnCrash(uint32_t flags, const char *message) +@@ -315,6 +319,8 @@ reportOnCrash(uint32_t flags, const char *message) &oldMessage, newMessage, std::memory_order_release, SWIFT_MEMORY_ORDER_CONSUME));