From 1e1d91df6a3e73537e04789b5465c51b1029f96a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 1 Nov 2023 22:14:49 +0100 Subject: [PATCH] SCons: Re-disable exceptions for Android, iOS, and Web We made a mistake when cherry-picking #80612 with 269b115d9cff1ad1bf1cd8675cd26c8a24065c89, where the global flag was defaulted to false to preserve the 4.1-stable behavior for desktop platforms, but we forgot that the refactoring removed the force disabling of exceptions for Android, iOS, and Web. This reintroduces this behavior so it should be back to the same as in 4.1/4.1.1, and the export templates should get back to their original size. Only difference, the old code used to keep exceptions for the Web editor, but I see no reason for it, so I disable them like with the templates. --- platform/android/detect.py | 1 + platform/ios/detect.py | 1 + platform/web/detect.py | 1 + 3 files changed, 3 insertions(+) diff --git a/platform/android/detect.py b/platform/android/detect.py index 33c65657899..c99fff445e8 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -68,6 +68,7 @@ def get_flags(): return [ ("arch", "arm64"), # Default for convenience. ("target", "template_debug"), + ("disable_exceptions", True), # Reduces size. ] diff --git a/platform/ios/detect.py b/platform/ios/detect.py index 40eb61abc8e..2f33e03b040 100644 --- a/platform/ios/detect.py +++ b/platform/ios/detect.py @@ -49,6 +49,7 @@ def get_flags(): ("arch", "arm64"), # Default for convenience. ("target", "template_debug"), ("use_volk", False), + ("disable_exceptions", True), # Reduces size. ] diff --git a/platform/web/detect.py b/platform/web/detect.py index dfc11a22cb7..b64c5a40e78 100644 --- a/platform/web/detect.py +++ b/platform/web/detect.py @@ -69,6 +69,7 @@ def get_flags(): # 100 KiB over -Os, which does not justify the negative impact on # run-time performance. ("optimize", "size"), + ("disable_exceptions", True), # Reduces size. ]