summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deps/gyp/pylib/gyp/generator/xcode.py6
-rw-r--r--mapboxgl.gyp3
2 files changed, 7 insertions, 2 deletions
diff --git a/deps/gyp/pylib/gyp/generator/xcode.py b/deps/gyp/pylib/gyp/generator/xcode.py
index a6faa4c063..783dafa0b0 100644
--- a/deps/gyp/pylib/gyp/generator/xcode.py
+++ b/deps/gyp/pylib/gyp/generator/xcode.py
@@ -31,6 +31,10 @@ _intermediate_var = 'INTERMEDIATE_DIR'
# targets that share the same BUILT_PRODUCTS_DIR.
_shared_intermediate_var = 'SHARED_INTERMEDIATE_DIR'
+# ONLY_ACTIVE_ARCH means that only the active architecture should be build for
+# Debugging purposes to shorten the build time
+_only_active_arch = 'ONLY_ACTIVE_ARCH'
+
_library_search_paths_var = 'LIBRARY_SEARCH_PATHS'
generator_default_variables = {
@@ -168,6 +172,8 @@ class XcodeProject(object):
xccl.SetBuildSetting(_shared_intermediate_var,
'$(SYMROOT)/DerivedSources/$(CONFIGURATION)')
+ xccl.ConfigurationNamed('Debug').SetBuildSetting(_only_active_arch, 'YES')
+
# Set user-specified project-wide build settings and config files. This
# is intended to be used very sparingly. Really, almost everything should
# go into target-specific build settings sections. The project-wide
diff --git a/mapboxgl.gyp b/mapboxgl.gyp
index d0356194d5..339e819fa0 100644
--- a/mapboxgl.gyp
+++ b/mapboxgl.gyp
@@ -210,8 +210,7 @@
],
'xcode_settings': {
'SDKROOT': 'iphoneos',
- 'SUPPORTED_PLATFORMS': ['iphonesimulator','iphoneos'],
- 'ARCHS': [ "armv7", "armv7s", "arm64", "i386", "x86_64" ],
+ 'SUPPORTED_PLATFORMS': 'iphonesimulator iphoneos',
'TARGETED_DEVICE_FAMILY': '1,2',
'CODE_SIGN_IDENTITY': 'iPhone Developer',
'IPHONEOS_DEPLOYMENT_TARGET': '7.0',