From 0e8f26dd6c61dc1e03984e7decefa334fa768c83 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Mon, 16 May 2016 17:05:39 -0700 Subject: [PATCH] Use the correct host toolchain when building from a local engine checkout on Mac. (#3956) --- packages/flutter_tools/lib/src/commands/build_aot.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/flutter_tools/lib/src/commands/build_aot.dart b/packages/flutter_tools/lib/src/commands/build_aot.dart index e267b10c3af..362ace76a36 100644 --- 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;