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

Merge pull request #15196 from bergzand/pr/docker/add_jobs

Browse Source 
docker: pass number of jobs from MAKEFLAGS to the container
This commit is contained in:
Francisco 2021-01-18 14:36:57 +01:00 committed by GitHub
commit ba4228cccf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
makefiles/docker.inc.mk
View File

@ -104,6 +104,16 @@ DOCKER_MAKE_ARGS ?=
# https://github.com/docker/for-mac/issues/2396 # https://github.com/docker/for-mac/issues/2396
ETC_LOCALTIME = $(realpath /etc/localtime) ETC_LOCALTIME = $(realpath /etc/localtime)
# Fetch the number of jobs from the MAKEFLAGS
# With $MAKE_VERSION < 4.2, the amount of parallelism is not available in
# $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_VERSION_OK = $(call memoized,MAKE_VERSION_OK,$(call \
version_is_greater,$(MAKE_VERSION),$(MAKE_JOBS_NEEDS)))
DOCKER_MAKE_JOBS = $(if $(MAKE_VERSION_OK),$(filter -j%,$(MAKEFLAGS)),)
DOCKER_MAKE_ARGS += $(DOCKER_MAKE_JOBS)
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Directory mapping functions # # Directory mapping functions #