[llvm-commits] [llvm] r58176 - in /llvm/trunk: cmake/config-ix.cmake cmake/modules/GetTargetTriple.cmake include/llvm/Config/config.h.cmake tools/llvm-config/CMakeLists.txt

[Oscar Fuentes]

Author: ofv
Date: Sat Oct 25 19:47:52 2008
New Revision: 58176

URL: http://llvm.org/viewvc/llvm-project?rev=58176&view=rev
Log:
CMake: GetTargetTriple: new module for determining the target
triple. Assign to LLVM_HOSTTRIPLE so it figures in config.h.

Added:
    llvm/trunk/cmake/modules/GetTargetTriple.cmake
Modified:
    llvm/trunk/cmake/config-ix.cmake
    llvm/trunk/include/llvm/Config/config.h.cmake
    llvm/trunk/tools/llvm-config/CMakeLists.txt

Modified: llvm/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=58176&r1=58175&r2=58176&view=diff

==============================================================================
--- llvm/trunk/cmake/config-ix.cmake (original)
+++ llvm/trunk/cmake/config-ix.cmake Sat Oct 25 19:47:52 2008
@@ -52,6 +52,10 @@
 check_symbol_exists(pthread_mutex_lock pthread.h HAVE_PTHREAD_MUTEX_LOCK)
 check_symbol_exists(strtoll stdlib.h HAVE_STRTOLL)
 
+include(GetTargetTriple)
+get_target_triple(LLVM_HOSTTRIPLE)
+message(STATUS "LLVM_HOSTTRIPLE: ${LLVM_HOSTTRIPLE}")
+
 if( MINGW )
   # tbi: Comprobar que existen las librerias:
   set(HAVE_LIBIMAGEHLP 1)

Added: llvm/trunk/cmake/modules/GetTargetTriple.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/GetTargetTriple.cmake?rev=58176&view=auto

==============================================================================
--- llvm/trunk/cmake/modules/GetTargetTriple.cmake (added)
+++ llvm/trunk/cmake/modules/GetTargetTriple.cmake Sat Oct 25 19:47:52 2008
@@ -0,0 +1,19 @@
+# Returns the host triple.
+# Invokes config.guess
+
+function( get_target_triple var )
+  if( MSVC )
+    set( ${var} "i686-pc-win32" PARENT_SCOPE )
+  else( MSVC )
+    set(config_guess ${LLVM_MAIN_SRC_DIR}/autoconf/config.guess)
+    execute_process(COMMAND sh ${config_guess}
+      RESULT_VARIABLE TT_RV
+      OUTPUT_VARIABLE TT_OUT
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if( NOT TT_RV EQUAL 0 )
+      message(FATAL_ERROR "Failed to execute ${config_guess}")
+    endif( NOT TT_RV EQUAL 0 )
+    set( ${var} ${TT_OUT} PARENT_SCOPE )
+    message(STATUS "Target triple: ${${var}}")
+  endif( MSVC )
+endfunction( get_target_triple var )

Modified: llvm/trunk/include/llvm/Config/config.h.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.cmake?rev=58176&r1=58175&r2=58176&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Config/config.h.cmake (original)
+++ llvm/trunk/include/llvm/Config/config.h.cmake Sat Oct 25 19:47:52 2008
@@ -440,6 +440,9 @@
 /* Installation directory for config files */
 #undef LLVM_ETCDIR
 
+/* Host triple we were built on */
+#cmakedefine LLVM_HOSTTRIPLE "${LLVM_HOSTTRIPLE}"
+
 /* Installation directory for include files */
 #undef LLVM_INCLUDEDIR
 

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

==============================================================================
--- llvm/trunk/tools/llvm-config/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-config/CMakeLists.txt Sat Oct 25 19:47:52 2008
@@ -29,17 +29,10 @@
 #EXEEXT already set.
 set(OS "${CMAKE_SYSTEM}")
 set(ARCH "X86") # TODO: This gives "i686" in Linux: "${CMAKE_SYSTEM_PROCESSOR}")
-# TODO: avoid using autoconf:
-set(config_guess ${LLVM_MAIN_SRC_DIR}/autoconf/config.guess)
-execute_process(COMMAND sh ${config_guess}
-  RESULT_VARIABLE TT_RV
-  OUTPUT_VARIABLE LLVM_TARGET_TRIPLET
-  OUTPUT_STRIP_TRAILING_WHITESPACE)
-message(STATUS "Target triplet: ${LLVM_TARGET_TRIPLET}")
-if( NOT TT_RV EQUAL 0 )
-  message(FATAL_ERROR "Failed to execute ${config_guess}")
-endif( NOT TT_RV EQUAL 0 )
-set(target ${LLVM_TARGET_TRIPLET})
+
+include(GetTargetTriple)
+get_target_triple(target)
+
 foreach(c ${LLVM_TARGETS_TO_BUILD})
   set(TARGETS_BUILT "${TARGETS_BUILT} ${c}")
 endforeach(c)