diff options
author | QMK Bot <hello@qmk.fm> | 2021-02-28 16:01:51 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-02-28 16:01:51 +0000 |
commit | 3b8ca5f343a1711cc4fb11a154a22c9470c2af21 (patch) | |
tree | 90447bd32565132cd7525422371dfbbb7e487565 /tmk_core | |
parent | b2f5bd7c60282ab8abc04d480f6348e0b8482436 (diff) | |
parent | 90c7ae70c68662c671ee1026d1c5abe67026c473 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core')
-rw-r--r-- | tmk_core/rules.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index f5f758943e..bbcfc1e4d1 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -108,6 +108,10 @@ endif CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) CFLAGS += $(CSTANDARD) +# This fixes lots of keyboards linking errors but SHOULDN'T BE A FINAL SOLUTION +# Fixing of multiple variable definitions must be made. +CFLAGS += -fcommon + #---------------- Compiler Options C++ ---------------- # -g*: generate debugging information # -O*: optimization level @@ -124,6 +128,7 @@ CXXFLAGS += -O$(OPT) CXXFLAGS += -w CXXFLAGS += -Wall CXXFLAGS += -Wundef + ifneq ($(strip $(ALLOW_WARNINGS)), yes) CXXFLAGS += -Werror endif |