tool/depot/create: add CCACHE=1 option

This commit complements issue #4004 with support for the depot/create
tool. If CCACHE=1 is specified at the command line, the build directory
for building a binary archive is configured with 'CCACHE := yes'.
This commit is contained in:
Norman Feske 2021-03-05 15:47:23 +01:00
parent 366fda0e47
commit 3d0ed5992d
3 changed files with 3 additions and 2 deletions

View File

@ -123,7 +123,7 @@ $(BUILD_MK_FILE): checked_source_archives_exist checked_no_uncategorized
echo -e "\nall: \$$(TARGETS)"; \ echo -e "\nall: \$$(TARGETS)"; \
echo -e "\n\$$(TARGETS):"; \ echo -e "\n\$$(TARGETS):"; \
echo -e "\t\$$(MAKE) -f \$$(TOOL_DIR)/depot/mk/\$${TOOL(\$$@)}" \ echo -e "\t\$$(MAKE) -f \$$(TOOL_DIR)/depot/mk/\$${TOOL(\$$@)}" \
"\$${ARGS(\$$@)} VERBOSE=\$$(VERBOSE)\n"; \ "\$${ARGS(\$$@)} CCACHE=\$$(CCACHE) VERBOSE=\$$(VERBOSE)\n"; \
) > $@ ) > $@

View File

@ -58,7 +58,7 @@ REBUILD ?= $(FORCE)
build: extract build: extract
$(if $(VERSIONED_ARCHIVES),\ $(if $(VERSIONED_ARCHIVES),\
$(VERBOSE)$(MAKE) -f $(GENODE_DIR)/tool/depot/build $(VERSIONED_ARCHIVES) \ $(VERBOSE)$(MAKE) -f $(GENODE_DIR)/tool/depot/build $(VERSIONED_ARCHIVES) \
VERBOSE=$(VERBOSE) REBUILD=$(REBUILD) \ VERBOSE=$(VERBOSE) CCACHE=$(CCACHE) REBUILD=$(REBUILD) \
KEEP_BUILD_DIR=$(KEEP_BUILD_DIR)) KEEP_BUILD_DIR=$(KEEP_BUILD_DIR))
$(MAKECMDGOALS): build $(MAKECMDGOALS): build

View File

@ -163,6 +163,7 @@ $(BUILD_CONF): checked_src_archive checked_api_archives
$(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 "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 \