This is an archive of the discontinued LLVM Phabricator instance.

Differential D17067

Improve CMake output of host and target triple
ClosedPublic

Authored by arichardson on Feb 10 2016, 3:53 AM.

Details

Reviewers
beanz
Commits
rG0775a2326e39: Improve CMake output of host and target triple
rL282516: Improve CMake output of host and target triple
Summary

The previous output was confusing as it would output "Taget triple:
x86_64-unknown-linux-gnu" even when LLVM_HOST_TRIPLE or
LLVM_DEFAULT_TARGET_TRIPLE were set on the CMake command line

Diff Detail

Event Timeline

arichardson updated this revision to Diff 47436.Feb 10 2016, 3:53 AM
arichardson retitled this revision from to Improve CMake output of host and target triple.
arichardson updated this object.
arichardson added a reviewer: beanz.Feb 10 2016, 3:56 AM
beanz accepted this revision.Feb 10 2016, 10:46 PM
beanz edited edge metadata.

LGTM.

This revision is now accepted and ready to land.Feb 10 2016, 10:46 PM
Eugene.Zelenko added a subscriber: Eugene.Zelenko.Sep 26 2016, 1:48 PM

Looks like patch was not committed.

arichardson added a comment.Sep 26 2016, 11:55 PM

I haven't submitted this because I don't have commit access.

beanz added a comment.Sep 27 2016, 11:15 AM

Ah! I will commit it for you now.

Thank you for the patch!

Closed by commit rL282516: Improve CMake output of host and target triple (authored by cbieneman). · Explain WhySep 27 2016, 11:17 AM
This revision was automatically updated to reflect the committed changes.
beanz added a comment.Sep 27 2016, 11:17 AM

Committed in rL282516

Revision Contents

PathSize
2 lines
cmake/
modules/
1 line

Diff 47436

CMakeLists.txt

Show First 20 Lines • Show All 407 Lines • ▼ Show 20 Lines
# first cmake run # first cmake run
include(config-ix) include(config-ix)
# By default, we target the host, but this can be overridden at CMake # By default, we target the host, but this can be overridden at CMake
# invocation time. # invocation time.
set(LLVM_DEFAULT_TARGET_TRIPLE "${LLVM_HOST_TRIPLE}" CACHE STRING set(LLVM_DEFAULT_TARGET_TRIPLE "${LLVM_HOST_TRIPLE}" CACHE STRING
"Default target for which LLVM will generate code." ) "Default target for which LLVM will generate code." )
set(TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE}") set(TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE}")
message(STATUS "LLVM host triple: ${LLVM_HOST_TRIPLE}")
message(STATUS "LLVM default target triple: ${LLVM_DEFAULT_TARGET_TRIPLE}")
include(HandleLLVMOptions) include(HandleLLVMOptions)
# Verify that we can find a Python 2 interpreter. Python 3 is unsupported. # Verify that we can find a Python 2 interpreter. Python 3 is unsupported.
# FIXME: We should support systems with only Python 3, but that requires work # FIXME: We should support systems with only Python 3, but that requires work
# on LLDB. # on LLDB.
set(Python_ADDITIONAL_VERSIONS 2.7) set(Python_ADDITIONAL_VERSIONS 2.7)
include(FindPythonInterp) include(FindPythonInterp)
▲ Show 20 Lines • Show All 342 Lines • Show Last 20 Lines

cmake/modules/GetHostTriple.cmake

Show All 20 Lines execute_process(COMMAND sh ${config_guess}
OUTPUT_VARIABLE TT_OUT OUTPUT_VARIABLE TT_OUT
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
if( NOT TT_RV EQUAL 0 ) if( NOT TT_RV EQUAL 0 )
message(FATAL_ERROR "Failed to execute ${config_guess}") message(FATAL_ERROR "Failed to execute ${config_guess}")
endif( NOT TT_RV EQUAL 0 ) endif( NOT TT_RV EQUAL 0 )
set( value ${TT_OUT} ) set( value ${TT_OUT} )
endif( MSVC ) endif( MSVC )
set( ${var} ${value} PARENT_SCOPE ) set( ${var} ${value} PARENT_SCOPE )
message(STATUS "Target triple: ${value}")
endfunction( get_host_triple var ) endfunction( get_host_triple var )