From: Felix Fietkau <nbd@nbd.name>
Date: Sat, 12 Jun 2021 12:24:40 +0000 (+0200)
Subject: tools: build ninja before ccache to fix the build order
X-Git-Tag: v22.03.0-rc1~2370
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=fa0aea53b2f1dccc2073efac8020151960d25513;p=openwrt%2Fstaging%2Fhauke.git

tools: build ninja before ccache to fix the build order

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/tools/Makefile b/tools/Makefile
index dccf298af6..a48aa80db3 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -79,7 +79,7 @@ ifneq ($(HOST_OS),Linux)
 endif
 
 ifneq ($(CONFIG_CCACHE)$(CONFIG_SDK),)
-$(foreach tool, $(filter-out xz zstd patch pkgconf libressl cmake,$(tools-y)), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/compile))
+$(foreach tool, $(filter-out xz zstd patch pkgconf libressl ninja cmake,$(tools-y)), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/compile))
 tools-y += ccache
 $(curdir)/ccache/compile := $(curdir)/zstd/compile
 endif
diff --git a/tools/ninja/Makefile b/tools/ninja/Makefile
index 3cbd6aebba..0ff642a740 100644
--- a/tools/ninja/Makefile
+++ b/tools/ninja/Makefile
@@ -20,7 +20,7 @@ endef
 
 define Host/Compile
 	cd $(HOST_BUILD_DIR) && \
-		CXX="$(HOSTCXX)" \
+		CXX="$(HOSTCXX_NOCACHE)" \
 		CXXFLAGS="$(HOST_CXXFLAGS) $(HOST_CPPFLAGS)" \
 		LDFLAGS="$(HOST_LDFLAGS)" \
 		$(STAGING_DIR_HOST)/bin/$(PYTHON) configure.py --bootstrap $(CONFIGURE_ARGS)