Fix version check in mingw-w64

Fixes #782.

Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2017-08-16 10:47:52 -07:00
parent e6bc8dfe86
commit 3d470580ce
3 changed files with 8 additions and 3 deletions

View File

@ -10,6 +10,10 @@
source "config/versions/mingw-w64.in"
config MINGW_W64_REQUIRES_W64_VENDOR
bool
default y if MINGW_W64_V4_or_later
config THREADS
default "win32" if THREADS_NATIVE
default "posix" if THREADS_POSIX

View File

@ -1,2 +1,3 @@
repository='git https://git.code.sf.net/p/mingw-w64/mingw-w64'
mirrors='http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/'
milestones='v4'

View File

@ -63,10 +63,10 @@ do_libc_start_files() {
do_check_mingw_vendor_tuple()
{
if [ "${CT_MINGW_W64_VERSION%%.*}" -ge 4 ]; then
if [ "${CT_MINGW_W64_REQUIRES_W64_VENDOR}" = "y" ]; then
CT_DoStep INFO "Checking configured vendor tuple"
if [ ${CT_TARGET_VENDOR} == w64 ]; then
CT_DoLog EXTRA "The tuple is set to '${CT_TARGET_VENDOR}', as recommended by mingw-64 developers."
if [ ${CT_TARGET_VENDOR} = "w64" ]; then
CT_DoLog DEBUG "The tuple is set to '${CT_TARGET_VENDOR}', as recommended by mingw-64 developers."
else
CT_DoLog WARN "The tuple vendor is '${CT_TARGET_VENDOR}', not equal to 'w64' and might break the toolchain!"
fi