summaryrefslogtreecommitdiff
path: root/platform/iphone
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-05-21 17:10:51 +0200
committerGitHub <noreply@github.com>2019-05-21 17:10:51 +0200
commitc29ef774d8fde7dda2a75f5966fde6815fb0358f (patch)
treee0a48740297f1564635e0e4c803d97ff6969c6f0 /platform/iphone
parent7d42ca838486ce4a737e074b60fffd81de1bc971 (diff)
parent4b20959d99645e591e5214a0883e31f29ef5a8a9 (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/iphone')
-rw-r--r--platform/iphone/detect.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py
index 3ed0a4ade7..d9f710e456 100644
--- a/platform/iphone/detect.py
+++ b/platform/iphone/detect.py
@@ -115,10 +115,12 @@ def configure(env):
env.Append(CPPFLAGS=['-DNEED_LONG_INT'])
env.Append(CPPFLAGS=['-DLIBYUV_DISABLE_NEON'])
- if env['ios_exceptions']:
- env.Append(CCFLAGS=['-fexceptions'])
- else:
- env.Append(CCFLAGS=['-fno-exceptions'])
+ # Disable exceptions on non-tools (template) builds
+ if not env['tools']:
+ if env['ios_exceptions']:
+ env.Append(CCFLAGS=['-fexceptions'])
+ else:
+ env.Append(CCFLAGS=['-fno-exceptions'])
## Link flags