alex/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-01-05 10:57:11 +10:00
Code Issues Packages Projects Releases Wiki Activity

build: drop BUNDLED_CMAKE_FLAG, BUNDLED_LUA_CMAKE_FLAG

Browse Source 
Problem:
We have too many build flags.

Solution:
Prepend to DEPS_CMAKE_FLAGS instead of defining a bunch of extra flags.
This commit is contained in:
Justin M. Keyes
2025-11-22 14:42:14 -05:00
parent 6c20531e48
commit d589ce28b0
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@@ -76,14 +76,21 @@ endif
DEPS_CMAKE_FLAGS ?=
USE_BUNDLED ?=
ifdef BUNDLED_CMAKE_FLAG
$(error BUNDLED_CMAKE_FLAG was removed. Use DEPS_CMAKE_FLAGS instead)
endif
ifdef BUNDLED_LUA_CMAKE_FLAG
$(error BUNDLED_LUA_CMAKE_FLAG was removed. Use DEPS_CMAKE_FLAGS instead)
endif
# If USE_BUNDLED is non-empty, prepend the flag to DEPS_CMAKE_FLAGS
ifneq (,$(USE_BUNDLED))
# Note: BUNDLED_CMAKE_FLAG is only supported for back-compat. Don't
# mention it in docs. It is redundant with DEPS_CMAKE_FLAGS.
BUNDLED_CMAKE_FLAG := -DUSE_BUNDLED=$(USE_BUNDLED)
DEPS_CMAKE_FLAGS := -DUSE_BUNDLED=$(USE_BUNDLED) $(DEPS_CMAKE_FLAGS)
endif
ifneq (,$(findstring functionaltest-lua,$(MAKECMDGOALS)))
BUNDLED_LUA_CMAKE_FLAG := -DUSE_BUNDLED_LUA=ON
DEPS_CMAKE_FLAGS := -DUSE_BUNDLED_LUA=ON $(DEPS_CMAKE_FLAGS)
$(shell [ -x $(DEPS_BUILD_DIR)/usr/bin/lua ] || $(RM) build/.ran-*)
endif
@@ -114,7 +121,7 @@ ifeq ($(call filter-true,$(USE_BUNDLED)),)
$(DEPS_BUILD_DIR):
$(MKDIR) $@
build/.ran-deps-cmake:: $(DEPS_BUILD_DIR)
$(CMAKE) -S $(MAKEFILE_DIR)/cmake.deps -B $(DEPS_BUILD_DIR) -G $(CMAKE_GENERATOR) $(BUNDLED_CMAKE_FLAG) $(BUNDLED_LUA_CMAKE_FLAG) $(DEPS_CMAKE_FLAGS)
$(CMAKE) -S $(MAKEFILE_DIR)/cmake.deps -B $(DEPS_BUILD_DIR) -G $(CMAKE_GENERATOR) $(DEPS_CMAKE_FLAGS)
endif
build/.ran-deps-cmake::
$(MKDIR) build