From 7f041100aeb12d9a54927aa32ee0410cc2a2216e 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 Fixes: #405 Signed-off-by: Felix Fietkau (cherry picked from commit fa0aea53b2f1dccc2073efac8020151960d25513) --- tools/Makefile | 4 ++-- tools/ninja/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 0a227766df..bae45d8373 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -46,7 +46,7 @@ $(curdir)/b43-tools/compile := $(curdir)/bison/compile $(curdir)/bc/compile := $(curdir)/bison/compile $(curdir)/libtool/compile $(curdir)/bison/compile := $(curdir)/flex/compile $(curdir)/cbootimage/compile += $(curdir)/automake/compile -$(curdir)/cmake/compile += $(curdir)/libressl/compile +$(curdir)/cmake/compile += $(curdir)/libressl/compile $(curdir)/ninja/compile $(curdir)/dosfstools/compile := $(curdir)/autoconf/compile $(curdir)/automake/compile $(curdir)/e2fsprogs/compile := $(curdir)/libtool/compile $(curdir)/fakeroot/compile := $(curdir)/libtool/compile @@ -85,7 +85,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 pkg-config 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)