build: Remove CCACHE_BIN variable, use wrappers in PATH instead.

Container have ccache wrappers in the PATH already, and the two
components CC / CXX just makes it harder to generate meson cross files.
This commit is contained in:
Rémi Bernon 2021-11-12 11:23:36 +01:00 committed by Arkadiusz Hiler
parent 4ade59b2ca
commit 5b8a6c72f9
2 changed files with 4 additions and 5 deletions

View file

@ -59,7 +59,6 @@ include $(SRC)/make/rules-cargo.mk
# If CC is coming from make's defaults or nowhere, use our own default. Otherwise respect environment.
CCACHE_ENV := $(patsubst %,-e %,$(shell env|cut -d= -f1|grep '^CCACHE_'))
ifeq ($(ENABLE_CCACHE),1)
CCACHE_BIN := ccache
export CCACHE_DIR := $(if $(CCACHE_DIR),$(CCACHE_DIR),$(HOME)/.ccache)
DOCKER_OPTS := -v $(CCACHE_DIR):$(CCACHE_DIR)$(CONTAINER_MOUNT_OPTS) $(CCACHE_ENV) -e CCACHE_DIR=$(CCACHE_DIR) $(DOCKER_OPTS)
else