alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/windows_mingw32_gcc' into 'master'

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

See merge request !1587
This commit is contained in:
Angus Gratton 2017-12-04 06:22:33 +08:00
commit 579201bcdc
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/kconfig/Makefile
View File

@ -23,6 +23,22 @@ CFLAGS :=
CPPFLAGS := CPPFLAGS :=
LDFLAGS := 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 default: mconf conf
xconfig: qconf xconfig: qconf