Kaynağa Gözat

Move USE_CCACHE logic to common location (#14899)

Joel Challis 3 yıl önce
ebeveyn
işleme
b36e0c6658
5 değiştirilmiş dosya ile 8 ekleme ve 11 silme
  1. 1 1
      tmk_core/arm_atsam.mk
  2. 1 1
      tmk_core/avr.mk
  3. 0 6
      tmk_core/chibios.mk
  4. 1 1
      tmk_core/native.mk
  5. 5 2
      tmk_core/rules.mk

+ 1 - 1
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

+ 1 - 1
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

+ 0 - 6
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

+ 1 - 1
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 =

+ 5 - 2
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