From 1593980d7c2cc3944a1f958b3e16287ed46318dd Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Mon, 9 Jan 2023 10:25:25 -0500 Subject: [PATCH] Allow building with host toolchain when building arm64e on an arm64 host. (#24315) The host toolchain should be fine in this case. --- build/config/BUILDCONFIG.gn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn index 9c63bd63b31466..13a13f804c3248 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -69,7 +69,9 @@ if (_chip_defaults.custom_toolchain != "") { } _default_toolchain = "${_build_overrides.build_root}/toolchain/linux:linux_${target_cpu}_${_target_compiler}" -} else if (target_os == host_os && target_cpu == host_cpu) { +} else if (target_os == host_os && + (target_cpu == host_cpu || + (target_cpu == "arm64e" && host_cpu == "arm64"))) { _default_toolchain = host_toolchain } else if (target_os == "freertos") { if (_chip_defaults.is_clang) {