[llvm-commits] [llvm] r79202 - in /llvm/trunk: cmake/modules/GetTargetTriple.cmake tools/CMakeLists.txt

[Oscar Fuentes]

Author: ofv
Date: Sun Aug 16 15:50:41 2009
New Revision: 79202

URL: http://llvm.org/viewvc/llvm-project?rev=79202&view=rev
Log:
CMake: Discriminate MINGW, MSYS, CYGWIN: does not try to build llvm-config under mingw without msys.

Modified:
    llvm/trunk/cmake/modules/GetTargetTriple.cmake
    llvm/trunk/tools/CMakeLists.txt

Modified: llvm/trunk/cmake/modules/GetTargetTriple.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/GetTargetTriple.cmake?rev=79202&r1=79201&r2=79202&view=diff

==============================================================================
--- llvm/trunk/cmake/modules/GetTargetTriple.cmake (original)
+++ llvm/trunk/cmake/modules/GetTargetTriple.cmake Sun Aug 16 15:50:41 2009
@@ -8,6 +8,8 @@
     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}

Modified: llvm/trunk/tools/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/CMakeLists.txt?rev=79202&r1=79201&r2=79202&view=diff

==============================================================================
--- llvm/trunk/tools/CMakeLists.txt (original)
+++ llvm/trunk/tools/CMakeLists.txt Sun Aug 16 15:50:41 2009
@@ -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