diff options
| -rwxr-xr-x | cmake/config-ix.cmake | 3 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | test/site.exp.in | 2 | ||||
| -rw-r--r-- | tools/llvm-config/CMakeLists.txt | 3 |
4 files changed, 4 insertions, 7 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index d67eaf7b01..f8d242420f 100755 --- a/cmake/config-ix.cmake +++ b/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/test/CMakeLists.txt b/test/CMakeLists.txt index 627b57d856..9f37037e02 100644 --- a/test/CMakeLists.txt +++ b/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/test/site.exp.in b/test/site.exp.in index 6a74ba81e7..bbb9638fe0 100644 --- a/test/site.exp.in +++ b/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/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt index 7638f3c629..8a710ea1cc 100644 --- a/tools/llvm-config/CMakeLists.txt +++ b/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) |