aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEisuke Kawashima <e-kwsm@users.noreply.github.com>2020-05-01 23:36:56 +0900
committerGitHub <noreply@github.com>2020-05-01 07:36:56 -0700
commit250e4e699fc4f40fdcfae4c2d1750f76d8d99cbc (patch)
tree3b65ee60b68569abe955cbc47685a511f5705c01
parentfe4383216b7a487d540172a9f5a4beade65056ba (diff)
downloadrneovim-250e4e699fc4f40fdcfae4c2d1750f76d8d99cbc.tar.gz
rneovim-250e4e699fc4f40fdcfae4c2d1750f76d8d99cbc.tar.bz2
rneovim-250e4e699fc4f40fdcfae4c2d1750f76d8d99cbc.zip
build: Inherit -n and -jN flags if Ninja #12219
-rw-r--r--Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 07dad26d7b..39f42739ff 100644
--- a/Makefile
+++ b/Makefile
@@ -58,11 +58,15 @@ endif
BUILD_CMD = $(BUILD_TOOL)
-ifneq ($(VERBOSE),)
- # Only need to handle Ninja here. Make will inherit the VERBOSE variable.
- ifeq ($(BUILD_TYPE),Ninja)
+# Only need to handle Ninja here. Make will inherit the VERBOSE variable, and the -j and -n flags.
+ifeq ($(BUILD_TYPE),Ninja)
+ ifneq ($(VERBOSE),)
BUILD_CMD += -v
endif
+ BUILD_CMD += $(shell printf '%s' '$(MAKEFLAGS)' | grep -o -- '-j[0-9]\+')
+ ifeq (n,$(findstring n,$(firstword -$(MAKEFLAGS))))
+ BUILD_CMD += -n
+ endif
endif
DEPS_CMAKE_FLAGS ?=