diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-05-31 12:16:22 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-05-31 13:45:42 +0100 |
| commit | 894c81b75aa2ffc4eef3c56e4c72fe70c4080b99 (patch) | |
| tree | 37b5135e79a69a30e2eac3f81a17efdd4701a813 /win32/find-mingw32.sh | |
| parent | 98e33fa25fb8feeb66cbf20b9cba0d5adff3e658 (diff) | |
| parent | ba42e1409ece2e9d56728e0ee6a6342c05ec6e52 (diff) | |
| download | syslinux-894c81b75aa2ffc4eef3c56e4c72fe70c4080b99.tar.gz | |
Merge remote-tracking branch 'zytor/master' into merge/elflink/master
A lot of development has gone on in the 'master' branch since the last
time we merged; new features, bug fixes, etc, etc.
Conflicts:
Makefile
com32/Makefile
com32/lib/Makefile
com32/lib/syslinux/load_linux.c
com32/modules/Makefile
com32/modules/chain.c
core/bootsect.inc
core/init.inc
version
Diffstat (limited to 'win32/find-mingw32.sh')
| -rwxr-xr-x | win32/find-mingw32.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/win32/find-mingw32.sh b/win32/find-mingw32.sh index f79949c7..51dcdd7e 100755 --- a/win32/find-mingw32.sh +++ b/win32/find-mingw32.sh @@ -20,7 +20,8 @@ for prefix in \ i386-mingw32msvc- \ i486-mingw32msvc- \ i586-mingw32msvc- \ - i686-mingw32msvc-; do + i686-mingw32msvc- \ + i686-w64-mingw32-; do if "${prefix}${cc}" -v > /dev/null 2>&1; then echo "$prefix" exit 0 |