From 5b8a6c72f9c6dbc8c04b54bd9ca5229ed73e36d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 12 Nov 2021 11:23:36 +0100
Subject: [PATCH] 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.
---
 build/makefile_base.mak | 1 -
 make/rules-common.mk    | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build/makefile_base.mak b/build/makefile_base.mak
index d935b9f6..80e75076 100644
--- a/build/makefile_base.mak
+++ b/build/makefile_base.mak
@@ -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
diff --git a/make/rules-common.mk b/make/rules-common.mk
index 0a0cded3..44ccd6e9 100644
--- a/make/rules-common.mk
+++ b/make/rules-common.mk
@@ -122,8 +122,8 @@ $(2)_ENV$(3) = \
     STRIP="$$(STRIP)" \
     AR="$$(TARGET_$(4)$(3))-ar" \
     RANLIB="$$(TARGET_$(4)$(3))-ranlib" \
-    CC="$$(CCACHE_BIN) $$(TARGET_$(4)$(3))-gcc" \
-    CXX="$$(CCACHE_BIN) $$(TARGET_$(4)$(3))-g++" \
+    CC="$$(TARGET_$(4)$(3))-gcc" \
+    CXX="$$(TARGET_$(4)$(3))-g++" \
     LD="$$(TARGET_$(4)$(3))-ld" \
     PKG_CONFIG="$$(TARGET_$(3))-pkg-config" \
     PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_BINDIR$(3))),,:):$$(SRC)/glslang/bin:$$$$PATH" \
@@ -146,8 +146,8 @@ ifneq ($(4),CROSS)
 $(2)_ENV$(3) += \
     CROSSAR="$$(TARGET_CROSS$(3))-ar" \
     CROSSRANLIB="$$(TARGET_CROSS$(3))-ranlib" \
-    CROSSCC="$$(CCACHE_BIN) $$(TARGET_CROSS$(3))-gcc" \
-    CROSSCXX="$$(CCACHE_BIN) $$(TARGET_CROSS$(3))-g++" \
+    CROSSCC="$$(TARGET_CROSS$(3))-gcc" \
+    CROSSCXX="$$(TARGET_CROSS$(3))-g++" \
     CROSSLD="$$(TARGET_CROSS$(3))-ld" \
     CROSSCFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3))" \
     CROSSCPPFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CPPFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3))" \