diff options
| -rw-r--r-- | cmake/modules/GetTargetTriple.cmake | 2 | ||||
| -rw-r--r-- | tools/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cmake/modules/GetTargetTriple.cmake b/cmake/modules/GetTargetTriple.cmake index 5708d62e8d..87262add59 100644 --- 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 8c2c1a5323..51eb725616 100644 --- 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 |