Fix CMake reporting of target triple.

llvm-svn: 86419
This commit is contained in:
Daniel Dunbar 2009-11-07 23:52:27 +00:00
parent c0fd8a4360
commit 39a6c62b9d
2 changed files with 6 additions and 6 deletions

View File

@ -147,7 +147,6 @@ endif()
include(GetTargetTriple)
get_target_triple(LLVM_HOSTTRIPLE)
message(STATUS "LLVM_HOSTTRIPLE: ${LLVM_HOSTTRIPLE}")
# FIXME: We don't distinguish the target and the host. :(
set(TARGET_TRIPLE "${LLVM_HOSTTRIPLE}")

View File

@ -4,12 +4,12 @@
function( get_target_triple var )
if( MSVC )
if( CMAKE_CL_64 )
set( ${var} "x86_64-pc-win32" PARENT_SCOPE )
set( value "x86_64-pc-win32" )
else()
set( ${var} "i686-pc-win32" PARENT_SCOPE )
set( value "i686-pc-win32" )
endif()
elseif( MINGW AND NOT MSYS )
set( ${var} "i686-pc-mingw32" PARENT_SCOPE )
set( value "i686-pc-mingw32" )
else( MSVC )
set(config_guess ${LLVM_MAIN_SRC_DIR}/autoconf/config.guess)
execute_process(COMMAND sh ${config_guess}
@ -19,7 +19,8 @@ function( get_target_triple var )
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}}")
set( value ${TT_OUT} )
endif( MSVC )
set( ${var} ${value} PARENT_SCOPE )
message(STATUS "Target triple: ${value}")
endfunction( get_target_triple var )