fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: build ninja before ccache to fix the build order

Browse Source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit fa0aea53b2)
This commit is contained in:
Felix Fietkau 2021-06-12 14:24:40 +02:00 committed by Tianling Shen
parent 540de2baef
commit a00a3fa00e
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/Makefile
View File

@ -82,7 +82,7 @@ ifneq ($(HOST_OS),Linux)
endif endif
ifneq ($(CONFIG_CCACHE)$(CONFIG_SDK),) 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 tools-y += ccache
$(curdir)/ccache/compile := $(curdir)/zstd/compile $(curdir)/ccache/compile := $(curdir)/zstd/compile
endif endif

2
tools/ninja/Makefile
View File

@ -20,7 +20,7 @@ endef
define Host/Compile define Host/Compile
cd $(HOST_BUILD_DIR) && \ cd $(HOST_BUILD_DIR) && \
CXX="$(HOSTCXX)" \ CXX="$(HOSTCXX_NOCACHE)" \
CXXFLAGS="$(HOST_CXXFLAGS) $(HOST_CPPFLAGS)" \ CXXFLAGS="$(HOST_CXXFLAGS) $(HOST_CPPFLAGS)" \
LDFLAGS="$(HOST_LDFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \
$(STAGING_DIR_HOST)/bin/$(PYTHON) configure.py --bootstrap $(CONFIGURE_ARGS) $(STAGING_DIR_HOST)/bin/$(PYTHON) configure.py --bootstrap $(CONFIGURE_ARGS)