From d6a312f43843608ac8e224e01b6f1697e35851f8 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Fri, 5 Mar 2021 16:06:15 +0100 Subject: [PATCH] tool/builddir: pass --ccache to run tool With this patch, the build directory's CCACHE configuration is applied to the building of depot archives when using the --depot-auto-update feature. Note that this is effective only when resetting the hash files before building so that each depot-auto-update results in the same-named versions. Otherwise, the include paths (that include the version name as part of the path) make cache hits impossible. Issue #4004 --- tool/builddir/build.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tool/builddir/build.mk b/tool/builddir/build.mk index 9ac5c6c97f..9df18257c5 100644 --- a/tool/builddir/build.mk +++ b/tool/builddir/build.mk @@ -31,6 +31,7 @@ # there is no need to change it. # # CONTRIB_DIR - location of ported 3rd-party source codes +# CCACHE - if set to 'yes', the build system uses the compiler cache # # REQUIRED_GCC_VERSION - GCC version required for building Genode # @@ -376,6 +377,8 @@ endif export CUSTOM_CC := $(CCACHED_CUSTOM_CC) export CUSTOM_CXX := $(CCACHED_CUSTOM_CXX) +RUN_OPT_CCACHE := --ccache + endif @@ -398,6 +401,7 @@ run/%: $(call select_from_repositories,run/%.run) $(RUN_ENV) --cross-dev-prefix "$(CROSS_DEV_PREFIX)" \ --qemu-args "$(QEMU_OPT)" \ --make "$(MAKE)" \ + $(RUN_OPT_CCACHE) \ $(RUN_OPT) \ --include $(RUN_SCRIPT)