From bacc8fd5ad2a070aedff6e1c5f425154f866460c Mon Sep 17 00:00:00 2001 From: Filipe Cabecinhas Date: Sat, 18 Oct 2014 23:36:12 +0000 Subject: [PATCH] New round of fixes for "Always compile debuginfo-tests for the host triple" clang tests were breaking, at least when compiling clang only, from an installed llvm. Make the lit.cfg script deal with the case when we don't have a host_triple available. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@220148 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/lit.cfg | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/lit.cfg b/test/lit.cfg index c4ef15d230..8a18e987c7 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -271,9 +271,15 @@ config.substitutions.append( ('%clangxx', ' ' + config.clang + config.substitutions.append( ('%clang', ' ' + config.clang + ' ') ) config.substitutions.append( ('%test_debuginfo', ' ' + config.llvm_src_root + '/utils/test_debuginfo.pl ') ) config.substitutions.append( ('%itanium_abi_triple', makeItaniumABITriple(config.target_triple)) ) -config.substitutions.append( ('%itanium_abi_host_triple', makeItaniumABITriple(config.host_triple)) ) config.substitutions.append( ('%ms_abi_triple', makeMSABITriple(config.target_triple)) ) +# The host triple might not be set, at least if we're compiling clang from +# an already installed llvm. +if config.host_triple and config.host_triple != '@LLVM_HOST_TRIPLE@': + config.substitutions.append( ('%target_itanium_abi_host_triple', '--target=%s' % makeItaniumABITriple(config.host_triple)) ) +else: + config.substitutions.append( ('%target_itanium_abi_host_triple', '') ) + # FIXME: Find nicer way to prohibit this. config.substitutions.append( (' clang ', """*** Do not use 'clang' in tests, use '%clang'. ***""") ) -- 2.40.0