| From b47a00af69f3c662e54dc54e482fc9b0d4ba6480 Mon Sep 17 00:00:00 2001 |
| From: Martell Malone <martellmalone@gmail.com> |
| Date: Sun, 28 Jun 2015 20:14:51 +0100 |
| Subject: [PATCH 2/5] Fix GetHostTriple for mingw-w64 in msys |
| |
| --- |
| cmake/modules/GetHostTriple.cmake | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/cmake/modules/GetHostTriple.cmake b/cmake/modules/GetHostTriple.cmake |
| index 0cad1db4eff..47e9f986e15 100644 |
| --- a/cmake/modules/GetHostTriple.cmake |
| +++ b/cmake/modules/GetHostTriple.cmake |
| @@ -8,11 +8,11 @@ |
| else() |
| set( value "i686-pc-windows-msvc" ) |
| endif() |
| - elseif( MINGW AND NOT MSYS ) |
| + elseif( MINGW ) |
| if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) |
| set( value "x86_64-w64-windows-gnu" ) |
| else() |
| - set( value "i686-pc-windows-gnu" ) |
| + set( value "i686-w64-windows-gnu" ) |
| endif() |
| elseif( CMAKE_SYSTEM_NAME MATCHES "OS390" ) |
| set( value "s390x-ibm-zos" ) |
| 2.13.3 |
| |
