diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2009-08-16 20:50:41 +0000 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2009-08-16 20:50:41 +0000 |
| commit | 91bd6c922d7cfd71e040b7fa259837fc2c925357 (patch) | |
| tree | bb2e109061459fb1ff71a85ed0d03c89be6b6db7 /llvm | |
| parent | 115d6bfcac9f38487bb8fbf00b66c7d7aca96cfa (diff) | |
| download | bcm5719-llvm-91bd6c922d7cfd71e040b7fa259837fc2c925357.tar.gz bcm5719-llvm-91bd6c922d7cfd71e040b7fa259837fc2c925357.zip | |
CMake: Discriminate MINGW, MSYS, CYGWIN: does not try to build llvm-config under mingw without msys.
llvm-svn: 79202
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/cmake/modules/GetTargetTriple.cmake | 2 | ||||
| -rw-r--r-- | llvm/tools/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/llvm/cmake/modules/GetTargetTriple.cmake b/llvm/cmake/modules/GetTargetTriple.cmake index 5708d62e8d8..87262add59d 100644 --- a/llvm/cmake/modules/GetTargetTriple.cmake +++ b/llvm/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/llvm/tools/CMakeLists.txt b/llvm/tools/CMakeLists.txt index 8c2c1a53239..51eb7256165 100644 --- a/llvm/tools/CMakeLists.txt +++ b/llvm/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 |
