From 9f34b9a08de04e5376e7d51bc75ca702f930ba61 Mon Sep 17 00:00:00 2001
From: "Justin R. Miller" <incanus@codesorcery.net>
Date: Fri, 24 Oct 2014 16:04:31 -0700
Subject: [PATCH 1/2] fixes #501: explicitly name architectures including
 armv7s

---
 mapboxgl.gyp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mapboxgl.gyp b/mapboxgl.gyp
index bdecb94d0..c4c286f3f 100644
--- a/mapboxgl.gyp
+++ b/mapboxgl.gyp
@@ -208,6 +208,7 @@
       'xcode_settings': {
         'SDKROOT': 'iphoneos',
         'SUPPORTED_PLATFORMS': 'iphonesimulator iphoneos',
+        'ARCHS': [ "armv7", "armv7s", "arm64", "i386", "x86_64" ],
         'TARGETED_DEVICE_FAMILY': '1,2',
         'CODE_SIGN_IDENTITY': 'iPhone Developer',
         'IPHONEOS_DEPLOYMENT_TARGET': '7.0',

From 6cd9de4f978835d42c89a78ce2058a5d2be4c0ff Mon Sep 17 00:00:00 2001
From: "Justin R. Miller" <incanus@codesorcery.net>
Date: Fri, 24 Oct 2014 16:14:51 -0700
Subject: [PATCH 2/2] bump Cocoa for Mason fixes

---
 ios/mapbox-gl-cocoa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/mapbox-gl-cocoa b/ios/mapbox-gl-cocoa
index bc2c5fe69..542e06537 160000
--- a/ios/mapbox-gl-cocoa
+++ b/ios/mapbox-gl-cocoa
@@ -1 +1 @@
-Subproject commit bc2c5fe6974fa99ea4816e9e793757cc17066594
+Subproject commit 542e06537b812261a69dabccfa8587421ace53d9