[openwrt/openwrt] tools/cmake: add MAKE config variable

LEDE Commits lede-commits at lists.infradead.org
Fri Feb 11 03:24:06 PST 2022


aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/0d25db7f17efbf5ab539508dd0a5d1eb739a1c43

commit 0d25db7f17efbf5ab539508dd0a5d1eb739a1c43
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Wed Feb 9 17:15:14 2022 -0800

    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 at gmail.com>
---
 tools/cmake/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)") \



More information about the lede-commits mailing list