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

SCons: Keep exceptions and rtti on Android, iOS and HTML5 tools build 

Those were disable to keep size small, and on Android avoid the dependency on the STL,
but for tools build (editor) this is not really a concern.

Note: as of today it's not possible to build tools=yes for those platforms, but this
change is one of the necessary steps to enable it.

Fixes #25262.

(cherry picked from commit 4b20959d99)
This commit is contained in:
Rémi Verschelde 2019-05-20 16:47:32 +02:00
parent 4492f6d193
commit f1fc6feca4
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/android/detect.py
View File

@ -212,13 +212,15 @@ def configure(env):
lib_sysroot = env["ANDROID_NDK_ROOT"] + "/platforms/" + env['ndk_platform'] + "/" + env['ARCH'] lib_sysroot = env["ANDROID_NDK_ROOT"] + "/platforms/" + env['ndk_platform'] + "/" + env['ARCH']
## Compile flags ## Compile flags
# Disable exceptions and rtti on non-tools (template) builds
if env['android_stl']: if env['tools'] or env['android_stl']:
env.Append(CPPFLAGS=["-isystem", env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/llvm-libc++/include"]) env.Append(CPPFLAGS=["-isystem", env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/llvm-libc++/include"])
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"])
env.Append(CXXFLAGS=['-frtti',"-std=gnu++14"]) env.Append(CXXFLAGS=['-frtti',"-std=gnu++14"])
else: else:
env.Append(CXXFLAGS=['-fno-rtti', '-fno-exceptions', '-DNO_SAFE_CAST']) env.Append(CXXFLAGS=['-fno-rtti', '-fno-exceptions'])
# Don't use dynamic_cast, necessary with no-rtti.
env.Append(CPPFLAGS=['-DNO_SAFE_CAST'])
ndk_version = get_ndk_version(env["ANDROID_NDK_ROOT"]) ndk_version = get_ndk_version(env["ANDROID_NDK_ROOT"])
if ndk_version != None and LooseVersion(ndk_version) >= LooseVersion("15.0.4075724"): if ndk_version != None and LooseVersion(ndk_version) >= LooseVersion("15.0.4075724"):

6
platform/iphone/detect.py
View File

@ -114,10 +114,12 @@ def configure(env):
env.Append(CPPFLAGS=['-DNEED_LONG_INT']) env.Append(CPPFLAGS=['-DNEED_LONG_INT'])
env.Append(CPPFLAGS=['-DLIBYUV_DISABLE_NEON']) env.Append(CPPFLAGS=['-DLIBYUV_DISABLE_NEON'])
# Disable exceptions on non-tools (template) builds
if not env['tools']:
if env['ios_exceptions']: if env['ios_exceptions']:
env.Append(CPPFLAGS=['-fexceptions']) env.Append(CCFLAGS=['-fexceptions'])
else: else:
env.Append(CPPFLAGS=['-fno-exceptions']) env.Append(CCFLAGS=['-fno-exceptions'])
## Link flags ## Link flags

2
platform/javascript/detect.py
View File

@ -110,6 +110,8 @@ def configure(env):
# once feasible also consider memory buffer size issues. # once feasible also consider memory buffer size issues.
env.Append(CPPDEFINES=['NO_THREADS']) env.Append(CPPDEFINES=['NO_THREADS'])
# Disable exceptions and rtti on non-tools (template) builds
if not env['tools']:
# These flags help keep the file size down. # These flags help keep the file size down.
env.Append(CCFLAGS=['-fno-exceptions', '-fno-rtti']) env.Append(CCFLAGS=['-fno-exceptions', '-fno-rtti'])
# Don't use dynamic_cast, necessary with no-rtti. # Don't use dynamic_cast, necessary with no-rtti.