diff options
| author | Joel Challis <git@zvecr.com> | 2021-10-21 14:39:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-21 14:39:13 +0100 |
| commit | b36e0c66581b5ec0e3aff5212857e9694115e66c (patch) | |
| tree | 9f5b4e7b2a294353598e123a659897cebe83a23d /tmk_core | |
| parent | 1816006121de991581d50d0bc6b5a653e2b3ccd2 (diff) | |
| download | qmk_firmware-b36e0c66581b5ec0e3aff5212857e9694115e66c.tar.gz qmk_firmware-b36e0c66581b5ec0e3aff5212857e9694115e66c.zip | |
Move USE_CCACHE logic to common location (#14899)
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/arm_atsam.mk | 2 | ||||
| -rw-r--r-- | tmk_core/avr.mk | 2 | ||||
| -rw-r--r-- | tmk_core/chibios.mk | 6 | ||||
| -rw-r--r-- | tmk_core/native.mk | 2 | ||||
| -rw-r--r-- | tmk_core/rules.mk | 7 |
5 files changed, 8 insertions, 11 deletions
diff --git a/tmk_core/arm_atsam.mk b/tmk_core/arm_atsam.mk index b29de9132..b49bf764d 100644 --- a/tmk_core/arm_atsam.mk +++ b/tmk_core/arm_atsam.mk | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | ############################################################################## | 2 | ############################################################################## |
| 3 | # Compiler settings | 3 | # Compiler settings |
| 4 | # | 4 | # |
| 5 | CC = arm-none-eabi-gcc | 5 | CC = $(CC_PREFIX) arm-none-eabi-gcc |
| 6 | OBJCOPY = arm-none-eabi-objcopy | 6 | OBJCOPY = arm-none-eabi-objcopy |
| 7 | OBJDUMP = arm-none-eabi-objdump | 7 | OBJDUMP = arm-none-eabi-objdump |
| 8 | SIZE = arm-none-eabi-size | 8 | SIZE = arm-none-eabi-size |
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index 940e95397..c52262273 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | ############################################################################## | 2 | ############################################################################## |
| 3 | # Compiler settings | 3 | # Compiler settings |
| 4 | # | 4 | # |
| 5 | CC = avr-gcc | 5 | CC = $(CC_PREFIX) avr-gcc |
| 6 | OBJCOPY = avr-objcopy | 6 | OBJCOPY = avr-objcopy |
| 7 | OBJDUMP = avr-objdump | 7 | OBJDUMP = avr-objdump |
| 8 | SIZE = avr-size | 8 | SIZE = avr-size |
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index c520d6025..957a25922 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk | |||
| @@ -398,12 +398,6 @@ OPT_DEFS += -DPROTOCOL_CHIBIOS | |||
| 398 | # Workaround to stop ChibiOS from complaining about new GCC -- it's been fixed for 7/8/9 already | 398 | # Workaround to stop ChibiOS from complaining about new GCC -- it's been fixed for 7/8/9 already |
| 399 | OPT_DEFS += -DPORT_IGNORE_GCC_VERSION_CHECK=1 | 399 | OPT_DEFS += -DPORT_IGNORE_GCC_VERSION_CHECK=1 |
| 400 | 400 | ||
| 401 | # Speed up recompilations by opt-in usage of ccache | ||
| 402 | USE_CCACHE ?= no | ||
| 403 | ifneq ($(USE_CCACHE),no) | ||
| 404 | CC_PREFIX ?= ccache | ||
| 405 | endif | ||
| 406 | |||
| 407 | # Construct GCC toolchain | 401 | # Construct GCC toolchain |
| 408 | CC = $(CC_PREFIX) $(TOOLCHAIN)gcc | 402 | CC = $(CC_PREFIX) $(TOOLCHAIN)gcc |
| 409 | OBJCOPY = $(TOOLCHAIN)objcopy | 403 | OBJCOPY = $(TOOLCHAIN)objcopy |
diff --git a/tmk_core/native.mk b/tmk_core/native.mk index f609fd0e6..eb2424ec5 100644 --- a/tmk_core/native.mk +++ b/tmk_core/native.mk | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | SYSTEM_TYPE := $(shell gcc -dumpmachine) | 1 | SYSTEM_TYPE := $(shell gcc -dumpmachine) |
| 2 | GCC_VERSION := $(shell gcc --version 2>/dev/null) | 2 | GCC_VERSION := $(shell gcc --version 2>/dev/null) |
| 3 | 3 | ||
| 4 | CC = gcc | 4 | CC = $(CC_PREFIX) gcc |
| 5 | OBJCOPY = | 5 | OBJCOPY = |
| 6 | OBJDUMP = | 6 | OBJDUMP = |
| 7 | SIZE = | 7 | SIZE = |
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 5a629d1eb..4c547cfd2 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk | |||
| @@ -69,8 +69,11 @@ CSTANDARD = -std=gnu99 | |||
| 69 | #CXXDEFS += -D__STDC_CONSTANT_MACROS | 69 | #CXXDEFS += -D__STDC_CONSTANT_MACROS |
| 70 | #CXXDEFS += | 70 | #CXXDEFS += |
| 71 | 71 | ||
| 72 | 72 | # Speed up recompilations by opt-in usage of ccache | |
| 73 | 73 | USE_CCACHE ?= yes | |
| 74 | ifneq ($(USE_CCACHE),no) | ||
| 75 | CC_PREFIX ?= ccache | ||
| 76 | endif | ||
| 74 | 77 | ||
| 75 | #---------------- Compiler Options C ---------------- | 78 | #---------------- Compiler Options C ---------------- |
| 76 | # -g*: generate debugging information | 79 | # -g*: generate debugging information |