From d589ce28b0020f71a53f0360e0a1d467da949a50 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 22 Nov 2025 14:42:14 -0500
Subject: [PATCH] build: drop BUNDLED_CMAKE_FLAG, BUNDLED_LUA_CMAKE_FLAG

Problem:
We have too many build flags.

Solution:
Prepend to DEPS_CMAKE_FLAGS instead of defining a bunch of extra flags.
---
 Makefile | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 68f94d50d3..569d3ff3f4 100644
--- a/Makefile
+++ b/Makefile
@@ -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