Merge branch 'bugfix/windows_mingw32_gcc' into 'master'
windows: Allow "make menuconfig" to work if ming32 gcc is also installed See merge request !1587
This commit is contained in:
commit
579201bcdc
1 changed files with 16 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue