Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move USE_CCACHE logic to common location #14899

Merged
merged 1 commit into from
Oct 21, 2021
Merged

Move USE_CCACHE logic to common location #14899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tmk_core/arm_atsam.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tmk_core/avr.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
##############################################################################
# Compiler settings
#
CC = avr-gcc
CC = $(CC_PREFIX) avr-gcc
OBJCOPY = avr-objcopy
OBJDUMP = avr-objdump
SIZE = avr-size
Expand Down
6 changes: 0 additions & 6 deletions tmk_core/chibios.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tmk_core/native.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 =
Expand Down
7 changes: 5 additions & 2 deletions tmk_core/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down