Please apply the attached. Thanks,
Steve.
>From 00f86101f84c6ca96a89aacc638cf15e61a42f44 Mon Sep 17 00:00:00 2001 From: Stephen Kelly <[email protected]> Date: Sun, 19 May 2013 21:09:16 +0200 Subject: [PATCH] Search for gcc in the gcc-cross directory. Ubuntu stores cross-compiling relevant files there now. --- lib/Driver/ToolChains.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index fffba0e..f70e93e 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -1382,6 +1382,8 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple( // up to the lib directory. const std::string LibSuffixes[] = { "/gcc/" + CandidateTriple.str(), + // Ubuntu puts cross-compilers in gcc-cross + "/gcc-cross/" + CandidateTriple.str(), "/" + CandidateTriple.str() + "/gcc/" + CandidateTriple.str(), // The Freescale PPC SDK has the gcc libraries in @@ -1396,6 +1398,7 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple( }; const std::string InstallSuffixes[] = { "/../../..", + "/../../..", "/../../../..", "/../..", "/../../../.." -- 1.8.1.2
_______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
