0001-disable-pre-canned-sysroot.patch 1.1 KB

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