Check cross-compiler only with 'arch-test' target

Author: jserv

Makefile

@@ -4,7 +4,8 @@ include mk/toolchain.mk
 OUT ?= build
 BIN := $(OUT)/rv32emu
 
--include $(OUT)/.config
+CONFIG_FILE := $(OUT)/.config
+-include $(CONFIG_FILE)
 
 CFLAGS = -std=gnu99 -O2 -Wall -Wextra
 CFLAGS += -Wno-unused-label
@@ -95,7 +96,7 @@ $(OUT)/emulate.o: CFLAGS += $(CFLAGS_NO_CET) -fomit-frame-pointer -fno-stack-che
 # to the first target after .DEFAULT_GOAL is not set.
 .DEFAULT_GOAL :=
 
-all: $(BIN)
+all: config $(BIN)
 
 OBJS := \
 	map.o \
@@ -122,8 +123,9 @@ $(BIN): $(OBJS)
 	$(VECHO) "  LD\t$@\n"
 	$(Q)$(CC) -o $@ $^ $(LDFLAGS)
 
-config:
-	$(Q)echo "$(CFLAGS)" | xargs -n1 | sort | sed -n 's/^RV32_FEATURE/ENABLE/p' > $(OUT)/.config
+config: $(CONFIG_FILE)
+$(CONFIG_FILE):
+	$(Q)echo "$(CFLAGS)" | xargs -n1 | sort | sed -n 's/^RV32_FEATURE/ENABLE/p' > $@
 	$(VECHO) "Check the file $(OUT)/.config for configured items.\n"
 
 # Tools

mk/riscv-arch-test.mk

@@ -5,6 +5,9 @@ export WORK := $(TARGETDIR)/build/arch-test
 export RISCV_DEVICE ?= IMCZicsrZifencei
 
 arch-test: $(BIN)
+ifeq ($(CROSS_COMPILE),)
+	$(error GNU Toolchain for RISC-V is required to build architecture tests. Please check package installation)
+endif
 	git submodule update --init $(dir $(ARCH_TEST_DIR))
 	$(Q)python3 -B $(RISCV_TARGET)/setup.py --riscv_device=$(RISCV_DEVICE)
 	$(Q)riscof run --work-dir=$(WORK) \

mk/toolchain.mk

@@ -42,8 +42,5 @@ endef
 # TODO: support clang/llvm based cross compilers
 # TODO: support native RISC-V compilers
 CROSS_COMPILE ?= $(word 1,$(foreach prefix,$(TOOLCHAIN_LIST),$(call check-cross-tools, $(prefix))))
-ifeq ($(CROSS_COMPILE),)
-$(warning GNU Toolchain for RISC-V is required to build architecture tests. Please check package installation)
-endif
 
 export CROSS_COMPILE