From 5f8c21f9e98ceafbe2784563b57883a07098cfb7 Mon Sep 17 00:00:00 2001 From: Alexander Thomas Date: Mon, 8 Jun 2020 16:50:21 +0000 Subject: [PATCH] [build] Use a sysroot also for the host toolchain when cross compiling Previously, we didn't use a sysroot for the host toolchain used to create the host_tool used in dart_actions. The compile action then failed on the new goma backend causing long build times. Before (dart-sdk-linux-try/429, ~38 mins): finished=10627 cache_hit=7334 retry=3277 fail=3277 After (dart-sdk-linux-try/430, ~12 mins): finished=10625 cache_hit=7352 retry=0 fail=0 Change-Id: Iebf967be6eb67c3056f766839a3d58d18fc608f5 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/150421 Reviewed-by: Ryan Macnak Commit-Queue: Ryan Macnak Auto-Submit: Alexander Thomas --- build/config/sysroot.gni | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni index 092022a9fea..c4ee9ad8689 100644 --- a/build/config/sysroot.gni +++ b/build/config/sysroot.gni @@ -33,7 +33,8 @@ if (is_linux && dart_use_debian_sysroot) { } } -if (current_toolchain == default_toolchain && target_sysroot != "") { +if ((current_toolchain == host_toolchain || + current_toolchain == default_toolchain) && target_sysroot != "") { sysroot = target_sysroot } else if (is_android) { import("//build/config/android/config.gni")