riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

makefiles/docker.inc.mk: use version_is_greater_or_equal for jobs check

Browse Source
This commit is contained in:
Francisco Molina 2021-01-18 14:38:44 +01:00
parent e455ccd3c0
commit c636a6501c
No known key found for this signature in database
GPG Key ID: 3E94EAC3DBDEEDA8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefiles/docker.inc.mk
View File

@ -109,9 +109,9 @@ ETC_LOCALTIME = $(realpath /etc/localtime)
# $MAKEFLAGS, only that parallelism is requested. So only -j, even if # $MAKEFLAGS, only that parallelism is requested. So only -j, even if
# something like -j3 is specified. This can be unexpected and dangerous # something like -j3 is specified. This can be unexpected and dangerous
# in older make so don't enable parallelism if $MAKE_VERSION < 4.2 # 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 \ 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_JOBS = $(if $(MAKE_VERSION_OK),$(filter -j%,$(MAKEFLAGS)),)
DOCKER_MAKE_ARGS += $(DOCKER_MAKE_JOBS) DOCKER_MAKE_ARGS += $(DOCKER_MAKE_JOBS)