godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[JS, Android] Re-add "no-exceptions" for export templates builds with ICU.

This commit is contained in:
bruvzg 2021-04-20 21:50:48 +03:00
parent 1616055b3b
commit 7e557bbec6
No known key found for this signature in database
GPG Key ID: 009E1BFE42239B95
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/android/detect.py
View File

@ -258,8 +258,10 @@ def configure(env):
env.Append(CPPFLAGS=["-isystem", env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/llvm-libc++abi/include"]) env.Append(CPPFLAGS=["-isystem", env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/llvm-libc++abi/include"])
# Disable exceptions and rtti on non-tools (template) builds # Disable exceptions and rtti on non-tools (template) builds
if env["tools"] or env["builtin_icu"]: if env["tools"]:
env.Append(CXXFLAGS=["-frtti"]) env.Append(CXXFLAGS=["-frtti"])
elif env["builtin_icu"]:
env.Append(CXXFLAGS=["-frtti", "-fno-exceptions"])
else: else:
env.Append(CXXFLAGS=["-fno-rtti", "-fno-exceptions"]) env.Append(CXXFLAGS=["-fno-rtti", "-fno-exceptions"])
# Don't use dynamic_cast, necessary with no-rtti. # Don't use dynamic_cast, necessary with no-rtti.

3
platform/javascript/detect.py
View File

@ -95,8 +95,9 @@ def configure(env):
if env["initial_memory"] < 64: if env["initial_memory"] < 64:
print("Editor build requires at least 64MiB of initial memory. Forcing it.") print("Editor build requires at least 64MiB of initial memory. Forcing it.")
env["initial_memory"] = 64 env["initial_memory"] = 64
elif env["builtin_icu"]:
env.Append(CCFLAGS=["-frtti"]) env.Append(CCFLAGS=["-frtti"])
elif env["builtin_icu"]:
env.Append(CCFLAGS=["-fno-exceptions", "-frtti"])
else: else:
# Disable exceptions and rtti on non-tools (template) builds # Disable exceptions and rtti on non-tools (template) builds
# These flags help keep the file size down. # These flags help keep the file size down.