Now that multiple prefixes are much cheaper to search for GCC

installations, support them when installed directly under the system
root ('/lib/gcc/...' essentially).

With this, Clang can correctly detect and use a cross-compiling GCC
installation within a system root and use it.

Again, test cases will be coming in later commits, as I'm going to write
a few test cases that exercise nearly all of this logic.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@141121 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index ec11e73a185da289b4b0026b54998ead9ff56aab..14ac85ecb516818bcb6bd276930f9d1f5e916b20 100644 (file)
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -1639,6 +1639,7 @@ public:
     // Compute the set of prefixes for our search.
     SmallVector<std::string, 8> Prefixes(D.PrefixDirs.begin(),
                                          D.PrefixDirs.end());
+    Prefixes.push_back(D.SysRoot);
     Prefixes.push_back(D.SysRoot + "/usr");
 
     // Loop over the various components which exist and select the best GCC