From: Fangrui Song <i@maskray.me>
Date: Sun, 21 Mar 2021 04:37:49 +0000 (-0700)
Subject: [Driver] Gnu.cpp: drop an unneeded special rule related to sysroot
X-Git-Tag: llvmorg-14-init~11784
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c2f9086b6184a132ec8cac7edeb620813796e1e8;p=platform%2Fupstream%2Fllvm.git

[Driver] Gnu.cpp: drop an unneeded special rule related to sysroot
---

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);
   }
 }