From c0fd8a4360d1234cff4f629d485a8a73fa1d335e Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Sat, 7 Nov 2009 23:52:20 +0000 Subject: [PATCH] Stop running get_target_triple more than we need to. llvm-svn: 86418 --- llvm/cmake/config-ix.cmake | 3 +++ llvm/test/CMakeLists.txt | 3 --- llvm/test/site.exp.in | 2 +- llvm/tools/llvm-config/CMakeLists.txt | 3 --- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index d67eaf7b0158..f8d242420fd2 100755 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -149,6 +149,9 @@ 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}") + # Determine the native architecture. string(TOLOWER "${LLVM_TARGET_ARCH}" LLVM_NATIVE_ARCH) if( LLVM_NATIVE_ARCH STREQUAL "host" ) diff --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt index 627b57d85634..9f37037e02f5 100644 --- a/llvm/test/CMakeLists.txt +++ b/llvm/test/CMakeLists.txt @@ -1,6 +1,3 @@ -include(GetTargetTriple) -get_target_triple(target) - foreach(c ${LLVM_TARGETS_TO_BUILD}) set(TARGETS_BUILT "${TARGETS_BUILT} ${c}") endforeach(c) diff --git a/llvm/test/site.exp.in b/llvm/test/site.exp.in index 6a74ba81e7f0..bbb9638fe00e 100644 --- a/llvm/test/site.exp.in +++ b/llvm/test/site.exp.in @@ -1,6 +1,6 @@ ## Autogenerated by LLVM/Clang configuration. # Do not edit! -set target_triplet "@target@" +set target_triplet "@TARGET_TRIPLE@" set TARGETS_TO_BUILD "@TARGETS_TO_BUILD@" set llvmgcc_langs "@LLVMGCC_LANGS@" set llvmgcc_version "@LLVMGCC_VERSION@" diff --git a/llvm/tools/llvm-config/CMakeLists.txt b/llvm/tools/llvm-config/CMakeLists.txt index 7638f3c629f8..8a710ea1cc8c 100644 --- a/llvm/tools/llvm-config/CMakeLists.txt +++ b/llvm/tools/llvm-config/CMakeLists.txt @@ -36,9 +36,6 @@ foreach(l ${LLVM_SYSTEM_LIBS_LIST}) set(LLVM_SYSTEM_LIBS ${LLVM_SYSTEM_LIBS} "-l${l}") endforeach() -include(GetTargetTriple) -get_target_triple(target) - foreach(c ${LLVM_TARGETS_TO_BUILD}) set(TARGETS_BUILT "${TARGETS_BUILT} ${c}") endforeach(c)