diff options
| author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2021-04-20 21:50:48 +0300 |
|---|---|---|
| committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2021-04-20 21:50:48 +0300 |
| commit | 7e557bbec6fdc7f0e939bfd2c62b1f46ccf2d2db (patch) | |
| tree | c854382c66c11ec709250a366ff1fdd147ce11e9 | |
| parent | 1616055b3b374aac24d4607d6686a87dfa41a535 (diff) | |
[JS, Android] Re-add "no-exceptions" for export templates builds with ICU.
| -rw-r--r-- | platform/android/detect.py | 4 | ||||
| -rw-r--r-- | platform/javascript/detect.py | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index 996b6dcf41..2a80a3c45b 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -258,8 +258,10 @@ def configure(env): env.Append(CPPFLAGS=["-isystem", env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/llvm-libc++abi/include"]) # Disable exceptions and rtti on non-tools (template) builds - if env["tools"] or env["builtin_icu"]: + if env["tools"]: env.Append(CXXFLAGS=["-frtti"]) + elif env["builtin_icu"]: + env.Append(CXXFLAGS=["-frtti", "-fno-exceptions"]) else: env.Append(CXXFLAGS=["-fno-rtti", "-fno-exceptions"]) # Don't use dynamic_cast, necessary with no-rtti. diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index ac8d8de7e0..09c4bd931a 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -95,8 +95,9 @@ def configure(env): if env["initial_memory"] < 64: print("Editor build requires at least 64MiB of initial memory. Forcing it.") env["initial_memory"] = 64 - elif env["builtin_icu"]: env.Append(CCFLAGS=["-frtti"]) + elif env["builtin_icu"]: + env.Append(CCFLAGS=["-fno-exceptions", "-frtti"]) else: # Disable exceptions and rtti on non-tools (template) builds # These flags help keep the file size down. |