From 7014731035ccee8cfce2e823d9b4bcb0d47036d7 Mon Sep 17 00:00:00 2001
From: Eisuke Kawashima <e-kwsm@users.noreply.github.com>
Date: Tue, 21 Sep 2021 15:19:46 +0900
Subject: [PATCH] build: enhance Makefile

- fix regression where `-j` is not passed to ninja
  (39c886551bf8323b63938f5dee5beb650c61f02b, #15708)
- enable to pass `-l` (load) to ninja as well
- s/BUILD_TYPE/CMAKE_GENERATOR/
---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 1ddf810ce0..86e723df67 100644
--- a/Makefile
+++ b/Makefile
@@ -48,11 +48,11 @@ endif
 ifeq (,$(BUILD_TOOL))
   ifeq (Ninja,$(CMAKE_GENERATOR))
     ifneq ($(shell $(CMAKE_PRG) --help 2>/dev/null | grep Ninja),)
-      BUILD_TOOL := ninja
+      BUILD_TOOL = ninja
     else
       # User's version of CMake doesn't support Ninja
       BUILD_TOOL = $(MAKE)
-      BUILD_TYPE := Unix Makefiles
+      CMAKE_GENERATOR := Unix Makefiles
     endif
   else
     BUILD_TOOL = $(MAKE)
@@ -60,12 +60,12 @@ ifeq (,$(BUILD_TOOL))
 endif
 
 
-# Only need to handle Ninja here.  Make will inherit the VERBOSE variable, and the -j and -n flags.
+# Only need to handle Ninja here.  Make will inherit the VERBOSE variable, and the -j, -l, and -n flags.
 ifeq ($(CMAKE_GENERATOR),Ninja)
   ifneq ($(VERBOSE),)
     BUILD_TOOL += -v
   endif
-  BUILD_TOOL += $(shell printf '%s' '$(MAKEFLAGS)' | grep -o -- '-j[0-9]\+')
+  BUILD_TOOL += $(shell printf '%s' '$(MAKEFLAGS)' | grep -o -- ' *-[jl][0-9]\+ *')
   ifeq (n,$(findstring n,$(firstword -$(MAKEFLAGS))))
     BUILD_TOOL += -n
   endif