denshooter/genode
1
0
Fork 0
mirror of https://github.com/mmueller41/genode.git synced 2026-01-21 12:32:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

tool/depot: fix forwarding of CCACHE

Browse Source 
The depot tool 'build_bin_archive' used to ask only whether CCACHE is empty or
not and, if it wasn't empty, the tool added 'CCACHE := yes' to the build.conf
of the temporary build dir. This caused the sub-build processes to use ccache
even when the top-level CCACHE variable was set to a bogus value.

Also adds documentation of the CCACHE variable to the help message of the
'build' and 'build_bin_archive' tool.

Ref #4212
This commit is contained in:
Martin Stein
2021-06-29 12:06:26 +02:00
committed by Christian Helmuth
parent 388e2a0e6d
commit 0074a7c4ac
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tool/depot/build
View File

@@ -45,6 +45,8 @@ define HELP_MESSAGE
KEEP_BUILD_DIR=1 Do not remove build directories of built binary KEEP_BUILD_DIR=1 Do not remove build directories of built binary
packages. This is useful for debugging build packages. This is useful for debugging build
problems. problems.
CCACHE=1 Compiler calls will use the C/C++ compiler cache.
endef endef
export GENODE_DIR := $(realpath $(dir $(MAKEFILE_LIST))/../..) export GENODE_DIR := $(realpath $(dir $(MAKEFILE_LIST))/../..)

11
tool/depot/mk/build_bin_archive
View File

@@ -12,11 +12,12 @@ define HELP_MESSAGE
usage: usage:
$(firstword $(MAKEFILE_LIST)) <src-name> SPEC=<spec> USER=<user> $(firstword $(MAKEFILE_LIST)) <src-name> SPEC=<spec> USER=<user> CCACHE=<ccache>
<src-name> name of the source archive to build <src-name> name of the source archive to build
<spec> build spec, e.g., x86_32, x86_64 <spec> build spec, e.g., x86_32, x86_64
<user> identity of the archive creator <user> identity of the archive creator
<ccache> compiler calls will use the C/C++ compiler cache if this is 1
endef endef
@@ -158,12 +159,18 @@ ifneq ($(MISSING_API_DIRS),)
@false @false
endif endif
ifeq ($(CCACHE),1)
BUILD_CONF_CCACHE := yes
else
BUILD_CONF_CCACHE :=
endif
$(BUILD_CONF): checked_src_archive checked_api_archives $(BUILD_CONF): checked_src_archive checked_api_archives
$(VERBOSE)mkdir -p $(dir $@) $(VERBOSE)mkdir -p $(dir $@)
$(VERBOSE) \ $(VERBOSE) \
( echo "GENODE_DIR := $(GENODE_DIR)"; \ ( echo "GENODE_DIR := $(GENODE_DIR)"; \
echo "BASE_DIR := $(GENODE_DIR)/repos/base"; \ echo "BASE_DIR := $(GENODE_DIR)/repos/base"; \
echo "override CCACHE := $(if $(CCACHE),yes)"; \ echo "override CCACHE := $(BUILD_CONF_CCACHE)"; \
echo "REPOSITORIES := $(SRC_DIR)"; \ echo "REPOSITORIES := $(SRC_DIR)"; \
for api in $(USED_APIS); do \ for api in $(USED_APIS); do \
echo "REPOSITORIES += $(DEPOT_API_DIR)/$$api"; done \ echo "REPOSITORIES += $(DEPOT_API_DIR)/$$api"; done \