Commit 906cc78d authored by Bill Wendling's avatar Bill Wendling
Browse files

Merging r142134: 

------------------------------------------------------------------------
r142134 | chandlerc | 2011-10-16 04:05:04 -0700 (Sun, 16 Oct 2011) | 1 line

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

llvm-svn: 142175
parent e6d5fab8

clang/lib/Driver/ToolChains.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1694,13 +1694,13 @@ private: 
    // 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[] = {

      "/../../..",