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 | c23a8d133c7a1a1b5467239334c664352d10d81f (patch) | |
| tree | 71974afac5fd907ba279bdbb8b2b22679b9bacb2 | |
| parent | 66a39699fb6b862e674415b32d307263812e996e (diff) | |
| download | external_llvm-c23a8d133c7a1a1b5467239334c664352d10d81f.zip external_llvm-c23a8d133c7a1a1b5467239334c664352d10d81f.tar.gz external_llvm-c23a8d133c7a1a1b5467239334c664352d10d81f.tar.bz2 | |
CMake: Discriminate MINGW, MSYS, CYGWIN: does not try to build llvm-config under mingw without msys.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79202 91177308-0d34-0410-b5e6-96231b3b80d8
| -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 5708d62..87262ad 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 8c2c1a5..51eb725 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 |