[Intel-gfx] [maintainer-tools PATCH 4/6] dim: add DIM_MAKE_OPTIONS configuration

[Jani Nikula]

Defaults to -j20.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 dim     | 7 +++++--
 dim.rst | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dim b/dim
index 76da7e347a6e..e3ef4365e85f 100755
--- a/dim
+++ b/dim
@@ -74,6 +74,9 @@ DIM_DRM_UPSTREAM_REMOTE=${DIM_DRM_UPSTREAM_REMOTE:-airlied}
 # usage: $DIM_MUA [-s subject] [-i file] [-c cc-addr] to-addr [...]
 DIM_MUA=${DIM_MUA:-mutt}
 
+# make options (not used for C=1)
+DIM_MAKE_OPTIONS=${DIM_MAKE_OPTIONS:--j20}
+
 # command to run after dim apply
 DIM_POST_APPLY_ACTION=${DIM_POST_APPLY_ACTION:-}
 
@@ -539,7 +542,7 @@ function dim_cherry_pick_next_fixes
 dim_alias_ar=apply-resolved
 function dim_apply_resolved
 {
-	make -j 20 && git add -u && git am --resolved
+	make $DIM_MAKE_OPTIONS && git add -u && git am --resolved
 	checkpatch_commit HEAD
 	git commit --amend &
 }
@@ -549,7 +552,7 @@ function dim_magic_rebase_resolve
 {
 	git diff HEAD | patch -p1 -R
 	cat .git/rebase-merge/patch | dim mp
-	make -j 20
+	make $DIM_MAKE_OPTIONS
 	git add -u
 	git rebase --continue
 }
diff --git a/dim.rst b/dim.rst
index 0b436f212539..58e222a7d590 100644
--- a/dim.rst
+++ b/dim.rst
@@ -348,6 +348,10 @@ DIM_MUA
 Mail user agent. Must support the following subset of **mutt(1)** command line
 options: \$DIM_MUA [-s subject] [-i file] [-c cc-addr] to-addr [...]
 
+DIM_MAKE_OPTIONS
+----------------
+Additional options to pass to **make(1)**. Defaults to "-j20".
+
 DIM_TEMPLATE_HELLO
 ------------------
 Path to a file containing a greeting template for pull request mails.
-- 
2.1.4