Move USE_CCACHE logic to common location (#14899)

qmk · Oct 21, 2021 · b36e0c6 · b36e0c6
1 parent 1816006
commit b36e0c6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/tmk_core/arm_atsam.mk b/tmk_core/arm_atsam.mk
@@ -2,7 +2,7 @@
 ##############################################################################
 # Compiler settings
 #
-CC = arm-none-eabi-gcc
+CC = $(CC_PREFIX) arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
 OBJDUMP = arm-none-eabi-objdump
 SIZE = arm-none-eabi-size

diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
@@ -2,7 +2,7 @@
 ##############################################################################
 # Compiler settings
 #
-CC = avr-gcc
+CC = $(CC_PREFIX) avr-gcc
 OBJCOPY = avr-objcopy
 OBJDUMP = avr-objdump
 SIZE = avr-size

diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
@@ -398,12 +398,6 @@ OPT_DEFS += -DPROTOCOL_CHIBIOS
 # Workaround to stop ChibiOS from complaining about new GCC -- it's been fixed for 7/8/9 already
 OPT_DEFS += -DPORT_IGNORE_GCC_VERSION_CHECK=1
 
-# Speed up recompilations by opt-in usage of ccache
-USE_CCACHE ?= no
-ifneq ($(USE_CCACHE),no)
-    CC_PREFIX ?= ccache
-endif
-
 # Construct GCC toolchain
 CC      = $(CC_PREFIX) $(TOOLCHAIN)gcc
 OBJCOPY = $(TOOLCHAIN)objcopy

diff --git a/tmk_core/native.mk b/tmk_core/native.mk
@@ -1,7 +1,7 @@
 SYSTEM_TYPE := $(shell gcc -dumpmachine)
 GCC_VERSION := $(shell gcc --version 2>/dev/null)
 
-CC = gcc
+CC = $(CC_PREFIX) gcc
 OBJCOPY =
 OBJDUMP =
 SIZE =

diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
@@ -69,8 +69,11 @@ CSTANDARD = -std=gnu99
 #CXXDEFS += -D__STDC_CONSTANT_MACROS
 #CXXDEFS +=
 
-
-
+# Speed up recompilations by opt-in usage of ccache
+USE_CCACHE ?= yes
+ifneq ($(USE_CCACHE),no)
+    CC_PREFIX ?= ccache
+endif
 
 #---------------- Compiler Options C ----------------
 #  -g*:          generate debugging information