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 dccf298af6eef58e669f36c6724f4db4dd070117..a48aa80db3ad88eb1a9371f8cf34bb24b22d3260 100644 (file)
--- 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 3cbd6aebba7548f13a9e98e707b812fed506bb24..0ff642a740f636a0bc49f4010e0448629d2f5107 100644 (file)
--- 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)