From c636a6501c6bb8fd61ad4902a986214b89ca90e2 Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Mon, 18 Jan 2021 14:38:44 +0100 Subject: [PATCH] makefiles/docker.inc.mk: use version_is_greater_or_equal for jobs check --- makefiles/docker.inc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefiles/docker.inc.mk b/makefiles/docker.inc.mk index 98424fa230..2e4e61f32f 100644 --- a/makefiles/docker.inc.mk +++ b/makefiles/docker.inc.mk @@ -109,9 +109,9 @@ ETC_LOCALTIME = $(realpath /etc/localtime) # $MAKEFLAGS, only that parallelism is requested. So only -j, even if # something like -j3 is specified. This can be unexpected and dangerous # in older make so don't enable parallelism if $MAKE_VERSION < 4.2 -MAKE_JOBS_NEEDS = 4.1.999 +MAKE_JOBS_NEEDS = 4.2.0 MAKE_VERSION_OK = $(call memoized,MAKE_VERSION_OK,$(call \ - version_is_greater,$(MAKE_VERSION),$(MAKE_JOBS_NEEDS))) + version_is_greater_or_equal,$(MAKE_VERSION),$(MAKE_JOBS_NEEDS))) DOCKER_MAKE_JOBS = $(if $(MAKE_VERSION_OK),$(filter -j%,$(MAKEFLAGS)),) DOCKER_MAKE_ARGS += $(DOCKER_MAKE_JOBS)