suyu/Yucom
25
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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 a61b1c7c87
commit 28805deff4
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/makefile_base.mak
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. # 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_')) CCACHE_ENV := $(patsubst %,-e %,$(shell env|cut -d= -f1|grep '^CCACHE_'))
ifeq ($(ENABLE_CCACHE),1) ifeq ($(ENABLE_CCACHE),1)
CCACHE_BIN := ccache
export CCACHE_DIR := $(if $(CCACHE_DIR),$(CCACHE_DIR),$(HOME)/.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) DOCKER_OPTS := -v $(CCACHE_DIR):$(CCACHE_DIR)$(CONTAINER_MOUNT_OPTS) $(CCACHE_ENV) -e CCACHE_DIR=$(CCACHE_DIR) $(DOCKER_OPTS)
else else

8
make/rules-common.mk
View file

@ -122,8 +122,8 @@ $(2)_ENV$(3) = \
STRIP="$$(STRIP)" \ STRIP="$$(STRIP)" \
AR="$$(TARGET_$(4)$(3))-ar" \ AR="$$(TARGET_$(4)$(3))-ar" \
RANLIB="$$(TARGET_$(4)$(3))-ranlib" \ RANLIB="$$(TARGET_$(4)$(3))-ranlib" \
CC="$$(CCACHE_BIN) $$(TARGET_$(4)$(3))-gcc" \ CC="$$(TARGET_$(4)$(3))-gcc" \
CXX="$$(CCACHE_BIN) $$(TARGET_$(4)$(3))-g++" \ CXX="$$(TARGET_$(4)$(3))-g++" \
LD="$$(TARGET_$(4)$(3))-ld" \ LD="$$(TARGET_$(4)$(3))-ld" \
PKG_CONFIG="$$(TARGET_$(3))-pkg-config" \ PKG_CONFIG="$$(TARGET_$(3))-pkg-config" \
PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_BINDIR$(3))),,:):$$(SRC)/glslang/bin:$$$$PATH" \ 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) += \ $(2)_ENV$(3) += \
CROSSAR="$$(TARGET_CROSS$(3))-ar" \ CROSSAR="$$(TARGET_CROSS$(3))-ar" \
CROSSRANLIB="$$(TARGET_CROSS$(3))-ranlib" \ CROSSRANLIB="$$(TARGET_CROSS$(3))-ranlib" \
CROSSCC="$$(CCACHE_BIN) $$(TARGET_CROSS$(3))-gcc" \ CROSSCC="$$(TARGET_CROSS$(3))-gcc" \
CROSSCXX="$$(CCACHE_BIN) $$(TARGET_CROSS$(3))-g++" \ CROSSCXX="$$(TARGET_CROSS$(3))-g++" \
CROSSLD="$$(TARGET_CROSS$(3))-ld" \ CROSSLD="$$(TARGET_CROSS$(3))-ld" \
CROSSCFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3))" \ CROSSCFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3))" \
CROSSCPPFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CPPFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3))" \ CROSSCPPFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CPPFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3))" \