1From 49a14e693124dc34f2cccbfb755d01a1198aa6bf Mon Sep 17 00:00:00 2001 2From: Joel Winarske <joel.winarsk@gmail.com> 3Date: Wed, 19 Jul 2023 15:24:22 -0700 4Subject: [PATCH] disable pre-canned sysroot 5 6Override should be enabled if a custom sysroot using --target-sysroot is 7specified. If --target-sysroot is not set, then it should default to the 8pre-canned sysroot. 9 10Upstream: https://github.com/flutter/flutter/issues/123073 11Signed-off-by: Joel Winarske <joel.winarsk@gmail.com> 12Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com> 13--- 14 build/config/sysroot.gni | 2 +- 15 1 file changed, 1 insertion(+), 1 deletion(-) 16 17diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni 18index 7987e519d..1de694263 100644 19--- a/build/config/sysroot.gni 20+++ b/build/config/sysroot.gni 21@@ -14,7 +14,7 @@ declare_args() { 22 23 # Whether to use the default sysroot when building for Linux, if an explicit 24 # sysroot isn't set. 25- use_default_linux_sysroot = true 26+ use_default_linux_sysroot = false 27 } 28 29 if (current_toolchain == default_toolchain && target_sysroot != "") { 30-- 312.41.0 32 33