Explorar el Código

Merge branch 'bugfix/windows_mingw32_gcc' into 'master'

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

See merge request !1587

Angus Gratton hace 8 años
padre
commit
579201bcdc
Se han modificado 1 ficheros con 16 adiciones y 0 borrados
  1. 16 0
      tools/kconfig/Makefile

+ 16 - 0
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