From b351875f1ebd48a25db3e4eab6e0a0b036550941 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 6 Jul 2020 15:31:58 +0000 Subject: build system: Rely on xcompile for HOSTCC and HOSTCXX It already looks for them, so let's use the result instead of blindly defaulting to gcc/g++, except when not building an image (but run kconfig or tests) because we don't use xcompile in those cases. Change-Id: I3e50c70a609f1903a925610928f8779c191040d8 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/c/coreboot/+/43145 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6a96f9dee9..2705c66b51 100644 --- a/Makefile +++ b/Makefile @@ -61,8 +61,6 @@ endif # Disable implicit/built-in rules to make Makefile errors fail fast. .SUFFIXES: -HOSTCC := $(if $(shell type gcc 2>/dev/null),gcc,cc) -HOSTCXX = g++ HOSTCFLAGS := -g HOSTCXXFLAGS := -g @@ -128,6 +126,11 @@ endif rm -f $@.tmp ifeq ($(NOCOMPILE),1) +# We also don't use .xcompile in the no-compile situations, so +# provide some reasonable defaults. +HOSTCC ?= $(if $(shell type gcc 2>/dev/null),gcc,cc) +HOSTCXX ?= g++ + include $(TOPLEVEL)/Makefile.inc include $(TOPLEVEL)/payloads/Makefile.inc include $(TOPLEVEL)/util/testing/Makefile.inc -- cgit v1.2.3