diff options
| author | James McCoy <jamessan@jamessan.com> | 2021-09-21 08:22:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-21 08:22:08 -0400 |
| commit | c2089930268d24efa531ac98664adf55796385c5 (patch) | |
| tree | 06f2c80ec006a28032e6c0650b913f293ba168dc | |
| parent | 21f7555277e4b19a5c6a9534b1ce784d8a0a7b1f (diff) | |
| parent | 7014731035ccee8cfce2e823d9b4bcb0d47036d7 (diff) | |
| download | rneovim-c2089930268d24efa531ac98664adf55796385c5.tar.gz rneovim-c2089930268d24efa531ac98664adf55796385c5.tar.bz2 rneovim-c2089930268d24efa531ac98664adf55796385c5.zip | |
Merge pull request #15745 from e-kwsm/Makefile
build: enhance Makefile
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 |