aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 ?=