From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 10 Feb 2022 01:15:14 +0000 (-0800)
Subject: tools/cmake: add MAKE config variable
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0d25db7f17efbf5ab539508dd0a5d1eb739a1c43;p=openwrt%2Fstaging%2Fthess.git

tools/cmake: add MAKE config variable

Makes sure that Ninja from staging_dir is used and nowhere else.

Reported by reproducible builds project. Builds have been failing ever
since tools/cmake started using Ninja.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---

diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile
index e54e8c4547..8f0631eb74 100644
--- a/tools/cmake/Makefile
+++ b/tools/cmake/Makefile
@@ -25,7 +25,8 @@ HOST_CONFIGURE_VARS += \
 	CC="$(HOSTCC_NOCACHE)" \
 	CXX="$(HOSTCXX_NOCACHE)" \
 	MAKEFLAGS="$(HOST_JOBS)" \
-	CXXFLAGS="$(HOST_CFLAGS)"
+	CXXFLAGS="$(HOST_CFLAGS)" \
+	MAKE="$(STAGING_DIR_HOST)/bin/ninja"
 
 HOST_CONFIGURE_ARGS := \
 	$(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)") \