From 2a607a7aafe124c2244e0f4cae8e982f952fa682 Mon Sep 17 00:00:00 2001
From: Watson <watson1978@gmail.com>
Date: Fri, 19 Dec 2014 23:24:23 +0900
Subject: [PATCH] remove `i386' at :build:simulator task

---
 lib/motion/project/template/ios.rb        | 4 +++-
 lib/motion/project/template/ios/config.rb | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/motion/project/template/ios.rb b/lib/motion/project/template/ios.rb
index 8902d495..0475fba1 100644
--- a/lib/motion/project/template/ios.rb
+++ b/lib/motion/project/template/ios.rb
@@ -64,6 +64,9 @@ namespace :build do
 
   desc "Build the simulator version"
   task :simulator do
+    # No longer build for i386 by default.
+    App.config.archs['iPhoneSimulator'].delete('i386') if App.config.archs['iPhoneSimulator'].include?('x86_64')
+
     pre_build_actions('iPhoneSimulator')
     App.build('iPhoneSimulator')
   end
@@ -300,7 +303,6 @@ end
 
 desc "Create a .a static library"
 task :static do
-  App.config.archs['iPhoneSimulator'] << 'i386'
   libs = %w{iPhoneSimulator iPhoneOS}.map do |platform|
     '"' + App.build(platform, :static => true) + '"'
   end
diff --git a/lib/motion/project/template/ios/config.rb b/lib/motion/project/template/ios/config.rb
index c7068659..c0786262 100644
--- a/lib/motion/project/template/ios/config.rb
+++ b/lib/motion/project/template/ios/config.rb
@@ -52,9 +52,8 @@ module Motion; module Project;
 
     def archs
       @archs ||= begin
-        # No longer build for i386 and armv7s by default.
+        # No longer build for armv7s by default.
         archs = super
-        archs['iPhoneSimulator'].delete('i386') if archs['iPhoneSimulator'].include?('x86_64')
         archs['iPhoneOS'].delete('armv7s')
         archs
       end