relocate Make version check to be above the inclusion of the board config (issue #375)

This commit is contained in:
Trammell hudson 2018-04-19 17:41:50 -04:00
parent 19ef20ed94
commit ee9bb29c7d
Failed to extract signature

View File

@ -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