diff options
| author | Bill Wendling <isanbard@gmail.com> | 2011-10-17 05:14:50 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2011-10-17 05:14:50 +0000 |
| commit | bfa3102cb0fc7089b4feded85072e2c13b3eb202 (patch) | |
| tree | 45ae32aec753be349004856e925d5fbc588df5a3 | |
| parent | 7572d3636a8f06f5d832f710401ecb06fdc8518d (diff) | |
Merging r142134:
------------------------------------------------------------------------
r142134 | chandlerc | 2011-10-16 04:05:04 -0700 (Sun, 16 Oct 2011) | 1 line
Fix a silly bug introduced in r142133.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_30@142175 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 2ce0d8082e..825a83d8b8 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -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[] = { "/../../..", |