[llvm-commits] [llvm] r86418 - in /llvm/trunk: cmake/config-ix.cmake test/CMakeLists.txt test/site.exp.in tools/llvm-config/CMakeLists.txt
Daniel Dunbar
daniel at zuster.org
Sat Nov 7 15:52:20 PST 2009
Author: ddunbar
Date: Sat Nov 7 17:52:20 2009
New Revision: 86418
URL: http://llvm.org/viewvc/llvm-project?rev=86418&view=rev
Log:
Stop running get_target_triple more than we need to.
Modified:
llvm/trunk/cmake/config-ix.cmake
llvm/trunk/test/CMakeLists.txt
llvm/trunk/test/site.exp.in
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=86418&r1=86417&r2=86418&view=diff
==============================================================================
--- llvm/trunk/cmake/config-ix.cmake (original)
+++ llvm/trunk/cmake/config-ix.cmake Sat Nov 7 17:52:20 2009
@@ -149,6 +149,9 @@
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" )
Modified: llvm/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CMakeLists.txt?rev=86418&r1=86417&r2=86418&view=diff
==============================================================================
--- llvm/trunk/test/CMakeLists.txt (original)
+++ llvm/trunk/test/CMakeLists.txt Sat Nov 7 17:52:20 2009
@@ -1,6 +1,3 @@
-include(GetTargetTriple)
-get_target_triple(target)
-
foreach(c ${LLVM_TARGETS_TO_BUILD})
set(TARGETS_BUILT "${TARGETS_BUILT} ${c}")
endforeach(c)
Modified: llvm/trunk/test/site.exp.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/site.exp.in?rev=86418&r1=86417&r2=86418&view=diff
==============================================================================
--- llvm/trunk/test/site.exp.in (original)
+++ llvm/trunk/test/site.exp.in Sat Nov 7 17:52:20 2009
@@ -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@"
Modified: llvm/trunk/tools/llvm-config/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/CMakeLists.txt?rev=86418&r1=86417&r2=86418&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-config/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-config/CMakeLists.txt Sat Nov 7 17:52:20 2009
@@ -36,9 +36,6 @@
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)
More information about the llvm-commits
mailing list