From ee9bb29c7d3c49a5f8e106dd68f80551569b3c2d Mon Sep 17 00:00:00 2001 From: Trammell hudson Date: Thu, 19 Apr 2018 17:41:50 -0400 Subject: [PATCH] relocate Make version check to be above the inclusion of the board config (issue #375) --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 00a919b9..e4180bae 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,13 @@ config := $(pwd)/config INSTALL := $(pwd)/install log_dir := $(build)/log +# Check that we have a correct version of make +LOCAL_MAKE_VERSION := $(shell $(MAKE) --version | head -1 | cut -d' ' -f3) +include modules/make + +ifeq "$(LOCAL_MAKE_VERSION)" "$(make_version)" + + BOARD ?= qemu-coreboot CONFIG := $(pwd)/boards/$(BOARD)/$(BOARD).config @@ -53,12 +60,6 @@ endef endif -# Check that we have a correct version of make -LOCAL_MAKE_VERSION := $(shell $(MAKE) --version | head -1 | cut -d' ' -f3) -include modules/make - -ifeq "$(LOCAL_MAKE_VERSION)" "$(make_version)" - # Create a temporary directory for the initrd initrd_dir := $(shell mktemp -d) initrd_lib_dir := $(initrd_dir)/lib