From: Pengxuan Zheng Date: Wed, 26 Jun 2019 22:07:43 +0000 (+0000) Subject: [cmake] Allow config.guess to be run with MSYS on Windows X-Git-Tag: android-x86-9.0-r1~1268 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e364a4d5a235fe4dc0980afbffa8f7d6ed1b6b15;p=android-x86%2Fexternal-llvm.git [cmake] Allow config.guess to be run with MSYS on Windows Summary: With r363420, config.guess can no longer be run with MSYS on Windows and this patch should be able to fix this particular case. Reviewers: compnerd Reviewed By: compnerd Subscribers: mgorny, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D63834 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@364485 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/cmake/modules/GetHostTriple.cmake b/cmake/modules/GetHostTriple.cmake index 463a79fc10c..6c15e2d4896 100644 --- a/cmake/modules/GetHostTriple.cmake +++ b/cmake/modules/GetHostTriple.cmake @@ -15,7 +15,7 @@ function( get_host_triple var ) set( value "i686-pc-windows-gnu" ) endif() else( MSVC ) - if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows) + if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows AND NOT MSYS) message(WARNING "unable to determine host target triple") else() set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess)