Disable c++ static destructors on exit that is causing crashes within…

… the destructors on app termination
project-chip · May 23, 2023 · 2b292f2 · 2b292f2
1 parent c24294a
commit 2b292f2
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/examples/tv-casting-app/darwin/MatterTvCastingBridge/chip_xcode_build_connector.sh b/examples/tv-casting-app/darwin/MatterTvCastingBridge/chip_xcode_build_connector.sh
@@ -52,31 +52,31 @@ for define in "${defines[@]}"; do
 
     # skip over those that GN does for us
     case "$define" in
-        CHIP_HAVE_CONFIG_H)
-            continue
-            ;;
+    CHIP_HAVE_CONFIG_H)
+        continue
+        ;;
     esac
     target_defines+=,\"${define//\"/\\\"}\"
 done
 target_defines=[${target_defines:1}]
 
 declare target_cpu=
 case $PLATFORM_PREFERRED_ARCH in
-    i386)
-        target_cpu=x86
-        ;;
-    x86_64)
-        target_cpu=x64
-        ;;
-    armv7)
-        target_cpu=arm
-        ;;
-    arm64)
-        target_cpu=arm64
-        ;;
-    *)
-        echo >&2
-        ;;
+i386)
+    target_cpu=x86
+    ;;
+x86_64)
+    target_cpu=x64
+    ;;
+armv7)
+    target_cpu=arm
+    ;;
+arm64)
+    target_cpu=arm64
+    ;;
+*)
+    echo >&2
+    ;;
 esac
 
 declare target_cflags='"-target","'"$PLATFORM_PREFERRED_ARCH"'-'"$LLVM_TARGET_TRIPLE_VENDOR"'-'"$LLVM_TARGET_TRIPLE_OS_VERSION"'"'
@@ -91,6 +91,8 @@ done
     target_cflags+=',"-flto"'
 }
 
+target_cflags+=',"-fno-c++-static-destructors"'
+
 declare -a args=(
     'default_configs_cosmetic=[]' # suppress colorization
     'chip_crypto="mbedtls"'