firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1814 from jason-simmons/mojo_toolchain_path

Browse Source 
Try to locate the toolchain in the output layout used by the Flutter …
This commit is contained in:
Jason Simmons 2016-02-12 12:46:43 -08:00
commit cdbc942753
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/flutter_tools/lib/src/toolchain.dart
View File

@ -32,6 +32,9 @@ class Compiler {
Future<String> _getCompilerPath(BuildConfiguration config) async { Future<String> _getCompilerPath(BuildConfiguration config) async {
if (config.type != BuildType.prebuilt) { if (config.type != BuildType.prebuilt) {
String compilerPath = path.join(config.buildDir, 'clang_x64', 'sky_snapshot'); 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)) if (FileSystemEntity.isFileSync(compilerPath))
return compilerPath; return compilerPath;
return null; return null;