New patch attached.
-Michael
Rafael Espíndola wrote:
LGTM with a comment saying why it is needed.
Cheers,
Rafael
On 22 March 2016 at 23:02, Michael Lampe via cfe-commits
<cfe-commits@lists.llvm.org> wrote:
Some distros with ten years of support ship an old gcc but later offer more
recent versions for installation in parallel. These versions are typically
not only needed for the compilation of llvm/clang, but also to properly use
the clang binary that comes out.
Clang already searches /usr at runtime for the most recent installation of
gcc. This patch appends paths for add-on installations of gcc in RHEL.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
Index: clang/lib/Driver/ToolChains.cpp
===================================================================
--- clang/lib/Driver/ToolChains.cpp (revision 265970)
+++ clang/lib/Driver/ToolChains.cpp (working copy)
@@ -1370,9 +1370,17 @@
// Then look for gcc installed alongside clang.
Prefixes.push_back(D.InstalledDir + "/..");
- // And finally in /usr.
- if (D.SysRoot.empty())
+ // Then look for distribution supplied gcc installations.
+ if (D.SysRoot.empty()) {
+ // Look for RHEL devtoolsets.
+ Prefixes.push_back("/opt/rh/devtoolset-4/root/usr");
+ Prefixes.push_back("/opt/rh/devtoolset-3/root/usr");
+ Prefixes.push_back("/opt/rh/devtoolset-2/root/usr");
+ Prefixes.push_back("/opt/rh/devtoolset-1.1/root/usr");
+ Prefixes.push_back("/opt/rh/devtoolset-1.0/root/usr");
+ // And finally in /usr.
Prefixes.push_back("/usr");
+ }
}
// Loop over the various components which exist and select the best GCC
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
