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/javascript | |
| 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/javascript')
| -rw-r--r-- | platform/javascript/detect.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 145ce8d83d..145ac42863 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -110,10 +110,12 @@ def configure(env): # once feasible also consider memory buffer size issues. env.Append(CPPDEFINES=['NO_THREADS']) - # These flags help keep the file size down. - env.Append(CCFLAGS=['-fno-exceptions', '-fno-rtti']) - # Don't use dynamic_cast, necessary with no-rtti. - env.Append(CPPDEFINES=['NO_SAFE_CAST']) + # Disable exceptions and rtti on non-tools (template) builds + if not env['tools']: + # These flags help keep the file size down. + env.Append(CCFLAGS=['-fno-exceptions', '-fno-rtti']) + # Don't use dynamic_cast, necessary with no-rtti. + env.Append(CPPDEFINES=['NO_SAFE_CAST']) if env['javascript_eval']: env.Append(CPPDEFINES=['JAVASCRIPT_EVAL_ENABLED']) |