diff options
| author | Jeremy Bettis <jbettis@chromium.org> | 2022-09-19 19:31:44 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-09-20 00:20:27 +0000 |
| commit | 145cc9689197c98c509fc4bd7352adc3daf2c092 (patch) | |
| tree | d91cfca19efe560d955edb9e68fff9e3410976cb | |
| parent | 2921a41587ffb6c58fc14097a5d59c328d4eadee (diff) | |
| download | chrome-ec-145cc9689197c98c509fc4bd7352adc3daf2c092.tar.gz | |
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 <jbettis@google.com>
> Change-Id: Icc134eb987033012188a7c77860d8115c41b4df4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3902029
> Tested-by: Jeremy Bettis <jbettis@chromium.org>
> Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
> Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
> Reviewed-by: Yuval Peress <peress@google.com>
> Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
> Code-Coverage: Aaron Massey <aaronmassey@google.com>
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 <jbettis@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Reviewed-by: Aaron Massey <aaronmassey@google.com>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
| -rw-r--r-- | core/host/toolchain.mk | 4 |
1 files changed, 1 insertions, 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),\ |