[llvm-branch-commits] [cfe-branch] r221618 - Merging r220148:

[Tom Stellard]

Author: tstellar
Date: Mon Nov 10 12:19:09 2014
New Revision: 221618

URL: http://llvm.org/viewvc/llvm-project?rev=221618&view=rev
Log:
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.

------------------------------------------------------------------------

Modified:
    cfe/branches/release_35/test/lit.cfg

Modified: cfe/branches/release_35/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_35/test/lit.cfg?rev=221618&r1=221617&r2=221618&view=diff
==============================================================================
--- cfe/branches/release_35/test/lit.cfg (original)
+++ cfe/branches/release_35/test/lit.cfg Mon Nov 10 12:19:09 2014
@@ -270,9 +270,15 @@ config.substitutions.append( ('%clangxx'
 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'. ***""") )