From 42be77b7a9cdd446c8c6ec010e179bffc6667f3b Mon Sep 17 00:00:00 2001
From: Jason Simmons <jsimmons@chromium.org>
Date: Fri, 12 Feb 2016 11:09:22 -0800
Subject: [PATCH] Try to locate the toolchain in the output layout used by the
 Flutter Linux target

---
 packages/flutter_tools/lib/src/toolchain.dart | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/flutter_tools/lib/src/toolchain.dart b/packages/flutter_tools/lib/src/toolchain.dart
index 1605a31358..1e5f52318a 100644
--- a/packages/flutter_tools/lib/src/toolchain.dart
+++ b/packages/flutter_tools/lib/src/toolchain.dart
@@ -32,6 +32,9 @@ class Compiler {
 Future<String> _getCompilerPath(BuildConfiguration config) async {
   if (config.type != BuildType.prebuilt) {
     String compilerPath = path.join(config.buildDir, 'clang_x64', 'sky_snapshot');
+    if (FileSystemEntity.isFileSync(compilerPath))
+      return compilerPath;
+    compilerPath = path.join(config.buildDir, 'sky_snapshot');
     if (FileSystemEntity.isFileSync(compilerPath))
       return compilerPath;
     return null;