diff options
| author | Tim Northover <Tim.Northover@arm.com> | 2013-05-04 07:36:23 +0000 |
|---|---|---|
| committer | Tim Northover <Tim.Northover@arm.com> | 2013-05-04 07:36:23 +0000 |
| commit | d66ad6c57115e85487e8a29b1e073305690a9be2 (patch) | |
| tree | d02875051b4844dd132edd4ba5dfdd516e82c02b /cmake | |
| parent | c1685b3a5052de377735f69e53e50741dbe5b52a (diff) | |
| download | llvm-d66ad6c57115e85487e8a29b1e073305690a9be2.tar.gz llvm-d66ad6c57115e85487e8a29b1e073305690a9be2.tar.bz2 llvm-d66ad6c57115e85487e8a29b1e073305690a9be2.tar.xz | |
Allow host triple to be correctly overridden in CMake builds
The intended semantics mirror autoconf, where the user is able to
specify a host triple, but if it's left to the build system then
"config.guess" is invoked for the default.
This also renames the LLVM_HOSTTRIPLE define to LLVM_HOST_TRIPLE to
fit in with the style of the surrounding defines.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@181112 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rwxr-xr-x | cmake/config-ix.cmake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 94916b83dc..11c6344a1c 100755 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -340,12 +340,13 @@ if (CMAKE_COMPILER_IS_GNUCXX) endif() endif() -include(GetHostTriple) -get_host_triple(LLVM_HOST_TRIPLE) - # By default, we target the host, but this can be overridden at CMake # invocation time. -set(LLVM_HOSTTRIPLE "${LLVM_HOST_TRIPLE}") +include(GetHostTriple) +get_host_triple(LLVM_INFERRED_HOST_TRIPLE) + +set(LLVM_HOST_TRIPLE "${LLVM_INFERRED_HOST_TRIPLE}" CACHE STRING + "Host on which LLVM binaries will run") # Determine the native architecture. string(TOLOWER "${LLVM_TARGET_ARCH}" LLVM_NATIVE_ARCH) |