Merge a754918 into f95c6c2

CocoaPods · Dec 9, 2019 · cd7dca8 · cd7dca8
2 parents f95c6c2 + a754918
commit cd7dca8
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/lib/cocoapods-packager/builder.rb b/lib/cocoapods-packager/builder.rb
@@ -304,7 +304,13 @@ def ios_build_options
     end
 
     def ios_architectures
-      archs = %w(x86_64 i386 arm64 armv7 armv7s)
+      xcode_version_string = `xcodebuild -version`.strip.split()[1]
+      xcode_version = Pod::Version.new(xcode_version_string)
+      archs = if xcode_version < Pod::Version.new('10.0')
+        %w(x86_64 i386 arm64 armv7 armv7s)
+      else
+        %w(x86_64 i386 arm64 arm64e armv7 armv7s)
+      end
       vendored_libraries.each do |library|
         archs = `lipo -info #{library}`.split & archs
       end