From 2ac7da07991bbe26119a8cf932a4c955f0c78ece Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 14 Jul 2015 18:30:39 -0300 Subject: [PATCH] Makefile: save MAKE_VERSION Save MAKE_VERSION as RUNNING_MAKE_VERSION since this is later clobbered by the make package. It will be used by the webkitgtk24 package to check for older make versions which have a bug building it with parallel jobs (it hangs). Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9a18853114..531ac5dc38 100644 --- a/Makefile +++ b/Makefile @@ -43,10 +43,13 @@ all: # Set and export the version string export BR2_VERSION := 2015.08-git +# Save running make version since it's clobbered by the make package +RUNNING_MAKE_VERSION := $(MAKE_VERSION) + # Check for minimal make version (note: this check will break at make 10.x) MIN_MAKE_VERSION = 3.81 -ifneq ($(firstword $(sort $(MAKE_VERSION) $(MIN_MAKE_VERSION))),$(MIN_MAKE_VERSION)) -$(error You have make '$(MAKE_VERSION)' installed. GNU make >= $(MIN_MAKE_VERSION) is required) +ifneq ($(firstword $(sort $(RUNNING_MAKE_VERSION) $(MIN_MAKE_VERSION))),$(MIN_MAKE_VERSION)) +$(error You have make '$(RUNNING_MAKE_VERSION)' installed. GNU make >= $(MIN_MAKE_VERSION) is required) endif export HOSTARCH := $(shell uname -m | \ -- 2.30.2