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 /include | |
| 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 'include')
| -rw-r--r-- | include/llvm/Config/config.h.cmake | 2 | ||||
| -rw-r--r-- | include/llvm/Config/config.h.in | 2 | ||||
| -rw-r--r-- | include/llvm/Config/llvm-config.h.cmake | 2 | ||||
| -rw-r--r-- | include/llvm/Config/llvm-config.h.in | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake index 93c2582ae2..32d192e455 100644 --- a/include/llvm/Config/config.h.cmake +++ b/include/llvm/Config/config.h.cmake @@ -589,7 +589,7 @@ #cmakedefine01 LLVM_HAS_ATOMICS /* Host triple LLVM will be executed on */ -#cmakedefine LLVM_HOSTTRIPLE "${LLVM_HOSTTRIPLE}" +#cmakedefine LLVM_HOST_TRIPLE "${LLVM_HOST_TRIPLE}" /* Installation directory for include files */ #cmakedefine LLVM_INCLUDEDIR "${LLVM_INCLUDEDIR}" diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in index 7fa00b8a03..950e66f275 100644 --- a/include/llvm/Config/config.h.in +++ b/include/llvm/Config/config.h.in @@ -594,7 +594,7 @@ #undef LLVM_HAS_ATOMICS /* Host triple LLVM will be executed on */ -#undef LLVM_HOSTTRIPLE +#undef LLVM_HOST_TRIPLE /* Installation directory for include files */ #undef LLVM_INCLUDEDIR diff --git a/include/llvm/Config/llvm-config.h.cmake b/include/llvm/Config/llvm-config.h.cmake index eda17ee4a6..c6f2bef210 100644 --- a/include/llvm/Config/llvm-config.h.cmake +++ b/include/llvm/Config/llvm-config.h.cmake @@ -41,7 +41,7 @@ #cmakedefine01 LLVM_HAS_ATOMICS /* Host triple LLVM will be executed on */ -#cmakedefine LLVM_HOSTTRIPLE "${LLVM_HOSTTRIPLE}" +#cmakedefine LLVM_HOST_TRIPLE "${LLVM_HOST_TRIPLE}" /* Installation directory for include files */ #cmakedefine LLVM_INCLUDEDIR "${LLVM_INCLUDEDIR}" diff --git a/include/llvm/Config/llvm-config.h.in b/include/llvm/Config/llvm-config.h.in index af3a324855..a5209fa9b2 100644 --- a/include/llvm/Config/llvm-config.h.in +++ b/include/llvm/Config/llvm-config.h.in @@ -41,7 +41,7 @@ #undef LLVM_HAS_ATOMICS /* Host triple LLVM will be executed on */ -#undef LLVM_HOSTTRIPLE +#undef LLVM_HOST_TRIPLE /* Installation directory for include files */ #undef LLVM_INCLUDEDIR |