Parcourir la source

tools: build ninja before ccache to fix the build order

Signed-off-by: Felix Fietkau <[email protected]>
Felix Fietkau il y a 4 ans
Parent
commit
fa0aea53b2
2 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. 1 1
      tools/Makefile
  2. 1 1
      tools/ninja/Makefile

+ 1 - 1
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

+ 1 - 1
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)