diff options
author | Fangrui Song <i@maskray.me> | 2021-03-20 21:37:49 -0700 |
---|---|---|
committer | Fangrui Song <i@maskray.me> | 2021-03-20 21:37:49 -0700 |
commit | c2f9086b6184a132ec8cac7edeb620813796e1e8 (patch) | |
tree | 88ea64f2b8581c84894acc9b2f4e94f51add4f56 | |
parent | 56700e937903969a4a95f68c59e38e35daaaa1ea (diff) | |
download | llvm-c2f9086b6184a132ec8cac7edeb620813796e1e8.zip llvm-c2f9086b6184a132ec8cac7edeb620813796e1e8.tar.gz llvm-c2f9086b6184a132ec8cac7edeb620813796e1e8.tar.bz2 |
[Driver] Gnu.cpp: drop an unneeded special rule related to sysroot
-rw-r--r-- | clang/lib/Driver/ToolChains/Gnu.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp index 39be774..0785796 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -2853,8 +2853,6 @@ void Generic_GCC::AddMultiarchPaths(const Driver &D, Paths); } - // See comments above on the multilib variant for details of why this is - // included even from outside the sysroot. const std::string &LibPath = std::string(GCCInstallation.getParentLibPath()); const llvm::Triple &GCCTriple = GCCInstallation.getTriple(); @@ -2862,11 +2860,7 @@ void Generic_GCC::AddMultiarchPaths(const Driver &D, addPathIfExists( D, LibPath + "/../" + GCCTriple.str() + "/lib" + Multilib.osSuffix(), Paths); - - // See comments above on the multilib variant for details of why this is - // only included from within the sysroot. - if (StringRef(LibPath).startswith(SysRoot)) - addPathIfExists(D, LibPath, Paths); + addPathIfExists(D, LibPath, Paths); } } |