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 /test | |
| 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 'test')
| -rw-r--r-- | test/Makefile | 2 | ||||
| -rw-r--r-- | test/lit.site.cfg.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/Makefile b/test/Makefile index 2213319df8..88573c5523 100644 --- a/test/Makefile +++ b/test/Makefile @@ -125,7 +125,7 @@ endif lit.site.cfg: FORCE @echo "Making LLVM 'lit.site.cfg' file..." - @$(ECHOPATH) s=@LLVM_HOSTTRIPLE@=$(HOST_TRIPLE)=g > lit.tmp + @$(ECHOPATH) s=@LLVM_HOST_TRIPLE@=$(HOST_TRIPLE)=g > lit.tmp @$(ECHOPATH) s=@TARGET_TRIPLE@=$(TARGET_TRIPLE)=g >> lit.tmp @$(ECHOPATH) s=@LLVM_SOURCE_DIR@=$(LLVM_SRC_ROOT)=g >> lit.tmp @$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> lit.tmp diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index 3a680b2812..1ae99eb024 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -1,6 +1,6 @@ ## Autogenerated by LLVM/Clang configuration. # Do not edit! -config.host_triple = "@LLVM_HOSTTRIPLE@" +config.host_triple = "@LLVM_HOST_TRIPLE@" config.target_triple = "@TARGET_TRIPLE@" config.llvm_src_root = "@LLVM_SOURCE_DIR@" config.llvm_obj_root = "@LLVM_BINARY_DIR@" |