diff --git a/dart_sdk.patch b/dart_sdk.patch index fa7c03a..5fe0ae3 100644 --- a/dart_sdk.patch +++ b/dart_sdk.patch @@ -1,8 +1,8 @@ diff --git a/BUILD.gn b/BUILD.gn -index 233a0900e55..5010af8fc55 100644 +index 3dd681d9d41..a8e43bc5953 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -99,6 +99,10 @@ group("create_sdk") { +@@ -100,6 +100,10 @@ group("create_sdk") { public_deps = [ "sdk:create_sdk" ] } @@ -14,10 +14,10 @@ index 233a0900e55..5010af8fc55 100644 public_deps = [ "sdk:create_platform_sdk" ] } diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index fb45d1ec551..9ccb1a27f4a 100644 +index 29ada988abb..2e4cf4ea9c8 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -269,8 +269,9 @@ config("compiler") { +@@ -260,8 +260,9 @@ config("compiler") { cflags += [ "-fPIC" ] ldflags += [ "-fPIC" ] } else { @@ -30,10 +30,10 @@ index fb45d1ec551..9ccb1a27f4a 100644 } diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn -index 91ebf8feb65..4ecf43807d4 100644 +index be0893506f2..7c5bb919ad4 100644 --- a/runtime/bin/BUILD.gn +++ b/runtime/bin/BUILD.gn -@@ -1143,3 +1143,47 @@ if (defined(is_linux) && is_linux && defined(is_asan) && is_asan && +@@ -1170,3 +1170,47 @@ if (defined(is_linux) && is_linux && defined(is_asan) && is_asan && } } } diff --git a/scripts/build_helpers/bin/build_dart.dart b/scripts/build_helpers/bin/build_dart.dart index c8e9cec..3b03b53 100644 --- a/scripts/build_helpers/bin/build_dart.dart +++ b/scripts/build_helpers/bin/build_dart.dart @@ -101,7 +101,7 @@ Future _fetchOrUpdateDartSdk() async { if (!Directory('dart-sdk').existsSync()) { logger.i('dart-sdk does not exist. Doing full fetch'); - Directory('dart-sdk').create(); + await Directory('dart-sdk').create(); final fetchResult = await inDir('dart-sdk', () async { final fetchProcess = @@ -162,6 +162,8 @@ Future _patchDartSdk() async { logger.i("Patching the Dart SDK to create libdart"); var result = await Process.run('git', ['apply', '../../dart_sdk.patch'], runInShell: true); + logger.d("[patch-stdout] ${result.stdout}"); + logger.d("[patch-stderr] ${result.stderr}"); logger.d('Patch result is ${result.exitCode}'); return result.exitCode; });