From 145cc9689197c98c509fc4bd7352adc3daf2c092 Mon Sep 17 00:00:00 2001 From: Jeremy Bettis Date: Mon, 19 Sep 2022 19:31:44 +0000 Subject: Revert "Makefile: Only set host toolchain if exists" This reverts commit 9935980b106f49cf524b07e83c6333cde3294cd3. Reason for revert: Found a less intrusive option. Original change's description: > Makefile: Only set host toolchain if exists > > To fix building outside of the chroot, only set the > CROSS_COMPILE_HOST_DEFAULT to x86_64-pc-linux-gnu- if the compiler > actually exists. > > BRANCH=None > BUG=b:246424843 > TEST=make test-coverage # in chroot > TEST=make test-coverage # in gitlab docker > TEST=emerge-corsola chromeos-ec > > Force-Relevant-Builds: all > Signed-off-by: Jeremy Bettis > Change-Id: Icc134eb987033012188a7c77860d8115c41b4df4 > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3902029 > Tested-by: Jeremy Bettis > Commit-Queue: Jeremy Bettis > Auto-Submit: Jeremy Bettis > Reviewed-by: Yuval Peress > Reviewed-by: Jack Rosenthal > Code-Coverage: Aaron Massey Bug: b:246424843 CQ-Depend: chromium:3905359 Change-Id: I629f72e949165dbd62f8c5beca73ce0e6c317d10 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3905358 Tested-by: Jeremy Bettis Reviewed-by: Jack Rosenthal Reviewed-by: Tom Hughes Reviewed-by: Aaron Massey Commit-Queue: Jeremy Bettis --- core/host/toolchain.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/host/toolchain.mk b/core/host/toolchain.mk index c0e4d90d43..168d0e24c2 100644 --- a/core/host/toolchain.mk +++ b/core/host/toolchain.mk @@ -2,9 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -CROSS_COMPILE_HOST_DEFAULT:=$(if \ - $(shell which x86_64-pc-linux-gnu-$(cc-name) 2>/dev/null), \ - x86_64-pc-linux-gnu-,) +CROSS_COMPILE_HOST_DEFAULT:=x86_64-pc-linux-gnu- $(call set-option,CROSS_COMPILE,\ $(CROSS_COMPILE_host),\ -- cgit v1.2.1