aboutsummaryrefslogtreecommitdiffstats
path: root/tmk_core
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-07-13 14:24:26 -0400
committerGitHub <noreply@github.com>2017-07-13 14:24:26 -0400
commit6ed8ce4f598f838b971aa290a499f852827e1b58 (patch)
tree088e5e6d1d0d448f0e5c4032a830c27b33a126ab /tmk_core
parent087af43dee545792f486069481460ed5997bc41b (diff)
parentb7d8dec7dccc9bc6b458e26a8d12fcdb4d73cdeb (diff)
downloadfirmware-6ed8ce4f598f838b971aa290a499f852827e1b58.tar.gz
firmware-6ed8ce4f598f838b971aa290a499f852827e1b58.tar.bz2
firmware-6ed8ce4f598f838b971aa290a499f852827e1b58.zip
Merge pull request #1491 from fredizzimo/msys2
Add support for msys2 build environment
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/native.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/tmk_core/native.mk b/tmk_core/native.mk
index 50232ee9b..530b50b84 100644
--- a/tmk_core/native.mk
+++ b/tmk_core/native.mk
@@ -1,3 +1,5 @@
+SYSTEM_TYPE := $(shell gcc -dumpmachine)
+
CC = gcc
OBJCOPY =
OBJDUMP =
@@ -14,6 +16,9 @@ COMPILEFLAGS += -funsigned-bitfields
COMPILEFLAGS += -ffunction-sections
COMPILEFLAGS += -fdata-sections
COMPILEFLAGS += -fshort-enums
+ifneq ($(findstring mingw, ${SYSTEM_TYPE}),)
+COMPILEFLAGS += -mno-ms-bitfields
+endif
CFLAGS += $(COMPILEFLAGS)
CFLAGS += -fno-inline-small-functions