diff options
| author | Nick Brassel <nick@tzarc.org> | 2021-10-19 08:29:27 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-18 22:29:27 +0100 |
| commit | d9be6dea3a545da8d6f3d3ace14b6df7e9b6f30e (patch) | |
| tree | f5e8bf1806b71c6a4a783d016cd0bf000c0e7b0e | |
| parent | 01b702bece4de0aa17c1df39a3305a1b643fd762 (diff) | |
Fix builds for ChibiOS + Cortex-M0[+] (#14879)
| -rw-r--r-- | tmk_core/chibios.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index cae840fa4f..ad0ffa762d 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk @@ -330,7 +330,7 @@ ifeq ($(strip $(MCU)), risc-v) endif endif endif - + # Default to compiling with picolibc for RISC-V targets if available, # which is available by default on current (bullseye) debian based systems. ifeq ($(shell $(TOOLCHAIN)gcc --specs=picolibc.specs -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0) @@ -338,11 +338,11 @@ ifeq ($(strip $(MCU)), risc-v) # Note that we still link with our own linker script # by providing it via the -T flag above. TOOLCHAIN_CFLAGS = --specs=picolibc.specs - + # Tell QMK that we are compiling with picolibc. OPT_DEFS += -DUSE_PICOLIBC endif - + # MCU architecture flags MCUFLAGS = -march=$(MCU_ARCH) \ -mabi=$(MCU_ABI) \ @@ -394,6 +394,9 @@ LDFLAGS += $(SHARED_LDFLAGS) $(TOOLCHAIN_LDFLAGS) $(MCUFLAGS) # Tell QMK that we are hosting it on ChibiOS. 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) |