windows: Allow "make menuconfig" to work if ming32 gcc is also installed

Closes https://github.com/espressif/esp-idf/issues/1296

diff --git a/tools/kconfig/Makefile b/tools/kconfig/Makefile
index 6675294b7974dbb255aed3649057ff5e8e92b122..2454e47af795095f813627ae0f7e2fa76f5f308c 100644 (file)
--- a/tools/kconfig/Makefile
+++ b/tools/kconfig/Makefile
@@ -23,6 +23,22 @@ CFLAGS :=
 CPPFLAGS :=
 LDFLAGS :=
 
+# Workaround for a bug on Windows if the mingw32 host compilers
+# are installed in addition to the MSYS ones. The kconfig tools
+# need to be compiled using the MSYS compiler.
+#
+# See https://github.com/espressif/esp-idf/issues/1296
+ifdef MSYSTEM
+ifeq ("$(MSYSTEM)", "MINGW32")
+ifeq ("$(CC)", "cc")
+CC := /usr/bin/gcc
+endif
+ifeq ("$(LD)", "ld")
+LD := /usr/bin/ld
+endif
+endif # MING32
+endif # MSYSTEM
+
 default: mconf conf
 
 xconfig: qconf