diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-21 17:10:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 17:10:51 +0200 |
| commit | c29ef774d8fde7dda2a75f5966fde6815fb0358f (patch) | |
| tree | e0a48740297f1564635e0e4c803d97ff6969c6f0 /platform/android | |
| parent | 7d42ca838486ce4a737e074b60fffd81de1bc971 (diff) | |
| parent | 4b20959d99645e591e5214a0883e31f29ef5a8a9 (diff) | |
Merge pull request #29032 from akien-mga/tools-exceptions-rtti
SCons: Keep exceptions and rtti on Android, iOS and HTML5 tools build
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/detect.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index ea70fefbc5..b7641172e4 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -214,13 +214,14 @@ def configure(env): lib_sysroot = env["ANDROID_NDK_ROOT"] + "/platforms/" + env['ndk_platform'] + "/" + env['ARCH'] ## Compile flags - - if env['android_stl']: + # Disable exceptions and rtti on non-tools (template) builds + 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++abi/include"]) env.Append(CXXFLAGS=['-frtti', "-std=gnu++14"]) else: 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"]) |