From fa0aea53b2f1dccc2073efac8020151960d25513 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 12 Jun 2021 14:24:40 +0200 Subject: [PATCH] tools: build ninja before ccache to fix the build order Signed-off-by: Felix Fietkau --- tools/Makefile | 2 +- tools/ninja/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index dccf298af6e..a48aa80db3a 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 3cbd6aebba7..0ff642a740f 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) -- 2.30.2