diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-11-07 23:52:27 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-11-07 23:52:27 +0000 |
| commit | 39a6c62b9d3f762b1d86eaf1a3b8a744fe8c2c3b (patch) | |
| tree | 8749245a0007a99fb468ee638ca3cd01681fcac8 /llvm | |
| parent | c0fd8a4360d1234cff4f629d485a8a73fa1d335e (diff) | |
| download | bcm5719-llvm-39a6c62b9d3f762b1d86eaf1a3b8a744fe8c2c3b.tar.gz bcm5719-llvm-39a6c62b9d3f762b1d86eaf1a3b8a744fe8c2c3b.zip | |
Fix CMake reporting of target triple.
llvm-svn: 86419
Diffstat (limited to 'llvm')
| -rwxr-xr-x | llvm/cmake/config-ix.cmake | 1 | ||||
| -rw-r--r-- | llvm/cmake/modules/GetTargetTriple.cmake | 11 |
2 files changed, 6 insertions, 6 deletions
diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index f8d242420fd..dc57a134036 100755 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -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}") diff --git a/llvm/cmake/modules/GetTargetTriple.cmake b/llvm/cmake/modules/GetTargetTriple.cmake index 87262add59d..ac0c0092426 100644 --- a/llvm/cmake/modules/GetTargetTriple.cmake +++ b/llvm/cmake/modules/GetTargetTriple.cmake @@ -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 ) |
