Commit 162fcbc8 authored by Tom Stellard's avatar Tom Stellard
Browse files

Revert "Driver: Don't mix system tools with devtoolset tools on RHEL" 

This reverts commit r304293.

This was comitted accidentally.

llvm-svn: 304296
parent 04058546

clang/lib/Driver/ToolChains.cpp

+0 −9
Original line number Diff line number Diff line
@@ -4112,15 +4112,6 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) 


  Distro Distro(D.getVFS());



  if (Distro.IsRedhat()) {

    // On RHEL, we want to add a bin directory that is relative to the detected

    // gcc install, because if we are using devtoolset gcc then we want to

    // use other tools from devtoolset (e.g. ld) instead of the standard system

    // tools.

    PPaths.push_back(Twine(GCCInstallation.getParentLibPath() +

                     "/../bin").str());

  }



  if (Distro.IsOpenSUSE() || Distro.IsUbuntu()) {

    ExtraOpts.push_back("-z");

    ExtraOpts.push_back("relro");