diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-04 10:22:24 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-04 10:22:24 +0200 |
| commit | cd7f172cf8b5706db08633662711fcc6027086bd (patch) | |
| tree | 219d6924926c3cfb2bfc367c244501fde01ef74a /platform | |
| parent | 34e0e7de58ba4e7f2e4954266de8f13d5eb44c56 (diff) | |
| parent | 82b87d7a17c39617c7e84065250be77135077e81 (diff) | |
Merge pull request #66804 from akien-mga/core-remove-NO_SAFE_CAST
Remove unsupported `NO_SAFE_CAST`/`-fno-rtti` from Android build
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/detect.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index e541aa0373..866131cbe3 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -156,15 +156,9 @@ def configure(env: "Environment"): env["RANLIB"] = compiler_path + "/llvm-ranlib" env["AS"] = compiler_path + "/clang" - # Disable exceptions and rtti on non-tools (template) builds - if env.editor_build: - 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. - env.Append(CPPDEFINES=["NO_SAFE_CAST"]) + # Disable exceptions on template builds + if not env.editor_build: + env.Append(CXXFLAGS=["-fno-exceptions"]) env.Append( CCFLAGS=( |