CMake: Discriminate MINGW, MSYS, CYGWIN: does not try to build llvm-config under...

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79202 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/cmake/modules/GetTargetTriple.cmake b/cmake/modules/GetTargetTriple.cmake
index 5708d62e8d8cdf4f887c2c776803c37a321fcb62..87262add59d3a5d35e70349b57d949ef1c5eeffe 100644 (file)
--- a/cmake/modules/GetTargetTriple.cmake
+++ b/cmake/modules/GetTargetTriple.cmake
@@ -8,6 +8,8 @@ function( get_target_triple var )
     else()
       set( ${var} "i686-pc-win32" PARENT_SCOPE )
     endif()
+  elseif( MINGW AND NOT MSYS )
+    set( ${var} "i686-pc-mingw32" PARENT_SCOPE )
   else( MSVC )
     set(config_guess ${LLVM_MAIN_SRC_DIR}/autoconf/config.guess)
     execute_process(COMMAND sh ${config_guess}

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 8c2c1a53239868a62ecef1b7629829f90712e21c..51eb72561659060a019dc295397eba745283161d 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -2,7 +2,7 @@
 # large and three small executables. This is done to minimize memory load
 # in parallel builds.  Please retain this ordering.
 
-if( NOT MSVC )
+if( NOT WIN32 OR MSYS OR CYGWIN )
   # It is useful to build llvm-config before the other tools, so we
   # have a fresh LibDeps.txt for regenerating the hard-coded library
   # dependencies. llvm-config/CMakeLists.txt takes care of this but we