mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-10 08:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15745 from e-kwsm/Makefile

Browse Source 
build: enhance Makefile
This commit is contained in:
James McCoy
2021-09-21 08:22:08 -04:00
committed by GitHub
parent 21f7555277 7014731035
commit c208993026
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -48,11 +48,11 @@ endif
ifeq (,$(BUILD_TOOL)) ifeq (,$(BUILD_TOOL))
ifeq (Ninja,$(CMAKE_GENERATOR)) ifeq (Ninja,$(CMAKE_GENERATOR))
ifneq ($(shell $(CMAKE_PRG) --help 2>/dev/null | grep Ninja),) ifneq ($(shell $(CMAKE_PRG) --help 2>/dev/null | grep Ninja),)
BUILD_TOOL := ninja BUILD_TOOL = ninja
else else
# User's version of CMake doesn't support Ninja # User's version of CMake doesn't support Ninja
BUILD_TOOL = $(MAKE) BUILD_TOOL = $(MAKE)
BUILD_TYPE := Unix Makefiles CMAKE_GENERATOR := Unix Makefiles
endif endif
else else
BUILD_TOOL = $(MAKE) BUILD_TOOL = $(MAKE)
@@ -60,12 +60,12 @@ ifeq (,$(BUILD_TOOL))
endif 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) ifeq ($(CMAKE_GENERATOR),Ninja)
ifneq ($(VERBOSE),) ifneq ($(VERBOSE),)
BUILD_TOOL += -v BUILD_TOOL += -v
endif 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)))) ifeq (n,$(findstring n,$(firstword -$(MAKEFLAGS))))
BUILD_TOOL += -n BUILD_TOOL += -n
endif endif