Author: fedor.sergeev Date: Tue Jan 23 04:24:01 2018 New Revision: 323194 URL: http://llvm.org/viewvc/llvm-project?rev=323194&view=rev Log: [Solaris] Make RHEL devtoolsets handling Linux-specific
Summary: This patch is meant to address the last outstanding review comment on the already approved (but not yet commited) https://reviews.llvm.org/D35755, namely making the handling of the RHEL devtoolsets Linux-specific. Don't know if it's best integrated into the former or applied subsequently. Tested on i386-pc-solaris2.11 and x86_64-pc-linux-gnu. Reviewers: fedor.sergeev, tstellar, jyknight Reviewed By: fedor.sergeev Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D42029 Modified: cfe/trunk/lib/Driver/ToolChains/Gnu.cpp Modified: cfe/trunk/lib/Driver/ToolChains/Gnu.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Gnu.cpp?rev=323194&r1=323193&r2=323194&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChains/Gnu.cpp (original) +++ cfe/trunk/lib/Driver/ToolChains/Gnu.cpp Tue Jan 23 04:24:01 2018 @@ -1788,17 +1788,14 @@ void Generic_GCC::GCCInstallationDetecto } // Non-Solaris is much simpler - most systems just go with "/usr". - if (SysRoot.empty()) { - // Yet, still look for RHEL devtoolsets - // (should it be done Linux-only??) + if (SysRoot.empty() && TargetTriple.getOS() == llvm::Triple::Linux) { + // Yet, still look for RHEL devtoolsets. Prefixes.push_back("/opt/rh/devtoolset-6/root/usr"); 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("/usr"); - } else { - Prefixes.push_back(SysRoot.str() + "/usr"); } + Prefixes.push_back(SysRoot.str() + "/usr"); } /*static*/ void Generic_GCC::GCCInstallationDetector::CollectLibDirsAndTriples( _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
