From: Tom Stellard Date: Mon, 10 Nov 2014 18:19:09 +0000 (+0000) Subject: Merging r220148: X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=accae81be729aef49eada7c84fd17be68bd049e0;p=clang Merging r220148: ------------------------------------------------------------------------ r220148 | me | 2014-10-18 19:36:12 -0400 (Sat, 18 Oct 2014) | 6 lines 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/branches/release_35@221618 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/lit.cfg b/test/lit.cfg index 3de6501e66..ccefb70f73 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -270,9 +270,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'. ***""") )