Merge pull request #42 from janvennemann/TIMOB-23652

[TIMOB-23652] Fix Swift-compiling in iOS10
tidev · Jul 21, 2016 · 92c3c62 · 92c3c62
2 parents 474f0b4 + 98c519f
commit 92c3c62
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/metabase/ios/lib/swift.js b/metabase/ios/lib/swift.js
@@ -12,12 +12,17 @@ var fs = require('fs'),
  */
 function generateSwiftAST (sdkPath, iosMinVersion, xcodeTargetOS, fn, callback) {
 	var args = ['swiftc', '-sdk', sdkPath, '-dump-ast', fn];
-	if (xcodeTargetOS === 'iphoneos') {
+	if (xcodeTargetOS === 'iphoneos' || xcodeTargetOS === 'iphonesimulator') {
 		args.push('-target');
-		//armv7 should be ok across all devices. But to note that we can do armv7s and arm64 here
-		args.push('armv7-apple-ios' + iosMinVersion);
+		if (xcodeTargetOS === 'iphoneos') {
+			// armv7 for all devices. Note that we also could use armv7s or arm64 here
+			args.push('armv7-apple-ios' + iosMinVersion);
+		} else {
+			var simArch = process.arch === 'i386' ? 'i386' : 'x86_64';
+			args.push(simArch + '-apple-ios' + iosMinVersion);
+		}
 	}
- 	var child = spawn('xcrun', args),
+	var child = spawn('xcrun', args),
 		buf = '';
 	// swiftc -sdk /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator9.0.sdk -dump-ast MySwift.swift
 	child.on('error', callback);
@@ -181,7 +186,7 @@ function generateSwiftMangledClassName (appName, className) {
 function generateSwiftMetabase (buildDir, sdk, sdkPath, iosMinVersion, xcodeTargetOS, metabase, framework, fn, callback) {
 	generateSwiftAST(sdkPath, iosMinVersion, xcodeTargetOS, fn, function (err, buf) {
 		if (err) {
-			return callback(err, buf); 
+			return callback(err, buf);
 		}
 		var classes = {},
 			classdef,