[llvm-branch-commits] [cfe-branch] r142175 - in /cfe/branches/release_30: ./ lib/Driver/ToolChains.cpp test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Mon Oct 17 00:14:50 2011
New Revision: 142175

URL: http://llvm.org/viewvc/llvm-project?rev=142175&view=rev
Log:
Merging r142134:
------------------------------------------------------------------------
r142134 | chandlerc | 2011-10-16 04:05:04 -0700 (Sun, 16 Oct 2011) | 1 line

Fix a silly bug introduced in r142133.
------------------------------------------------------------------------

Modified:
    cfe/branches/release_30/   (props changed)
    cfe/branches/release_30/lib/Driver/ToolChains.cpp
    cfe/branches/release_30/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 17 00:14:50 2011
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:142113,142133
+/cfe/trunk:142113,142133-142134
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_30/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_30/lib/Driver/ToolChains.cpp?rev=142175&r1=142174&r2=142175&view=diff
==============================================================================
--- cfe/branches/release_30/lib/Driver/ToolChains.cpp (original)
+++ cfe/branches/release_30/lib/Driver/ToolChains.cpp Mon Oct 17 00:14:50 2011
@@ -1694,13 +1694,13 @@
     // up to the lib directory.
     const std::string Suffixes[] = {
       "/gcc/" + CandidateTriple.str(),
-      CandidateTriple.str() + "/gcc/" + CandidateTriple.str(),
+      "/" + CandidateTriple.str() + "/gcc/" + CandidateTriple.str(),
 
       // Ubuntu has a strange mis-matched pair of triples that this happens to
       // match.
       // FIXME: It may be worthwhile to generalize this and look for a second
       // triple.
-      CandidateTriple.str() + "/gcc/i686-linux-gnu"
+      "/" + CandidateTriple.str() + "/gcc/i686-linux-gnu"
     };
     const std::string InstallSuffixes[] = {
       "/../../..",

Propchange: cfe/branches/release_30/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 17 00:14:50 2011
@@ -1,2 +1,2 @@
 /cfe/branches/type-system-rewrite/test/SemaCXX/warn-unreachable.cpp:134693-134817
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,142113,142133
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,142113,142133-142134