diff options
| author |   Tom Stellard <tstellar@redhat.com> | 2017-05-31 10:01:14 +0000 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2017-05-31 10:01:14 +0000 |
| commit | 162fcbc87e6820502c2bff42a4a1fc08567319db (patch) | |
| tree | 71456fd2756d510616ceef03ef322aa4e6bda298 | |
| parent | Revert "Driver: Update devtoolset usage for RHEL" (diff) | |
| download | llvm-project-162fcbc87e6820502c2bff42a4a1fc08567319db.tar.gz llvm-project-162fcbc87e6820502c2bff42a4a1fc08567319db.tar.bz2 llvm-project-162fcbc87e6820502c2bff42a4a1fc08567319db.zip | |
Revert "Driver: Don't mix system tools with devtoolset tools on RHEL"llvmorg-4.0.1-rc2
This reverts commit r304293.
This was comitted accidentally.
llvm-svn: 304296
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index a06a8a586336..9bc9ae4f6a52 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -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"); |