Use the correct host toolchain when building from a local engine checkout on Mac. (flutter#3956)

chinmaygarde · chinmaygarde · commit 0e8f26dd6c61 · 2016-05-16T17:05:39.000-07:00
diff --git a/packages/flutter_tools/lib/src/commands/build_aot.dart b/packages/flutter_tools/lib/src/commands/build_aot.dart
@@ -71,7 +71,9 @@ String buildAotSnapshot(
     entryPointsDir  = path.join(engineSrc, 'sky', 'engine', 'bindings');
     String engineOut = tools.getEngineArtifactsDirectory(
         TargetPlatform.android_arm, buildMode).path;
-    genSnapshot = path.join(engineOut, 'clang_x86', 'gen_snapshot');
+
+    String host32BitToolchain = getCurrentHostPlatform() == HostPlatform.darwin_x64 ? 'clang_i386' : 'clang_x86';
+    genSnapshot = path.join(engineOut, host32BitToolchain, 'gen_snapshot');
   } else {
     String artifactsDir = tools.getEngineArtifactsDirectory(
         TargetPlatform.android_arm, buildMode).path;
