[clang] 1f4959b - [Driver] Drop unneeded $triple/gcc/$triple detection

[Fangrui Song via cfe-commits]

Author: Fangrui Song
Date: 2021-03-19T22:45:50-07:00
New Revision: 1f4959b27607d4748c83820ffcf8bf24f09fdd47

URL: https://github.com/llvm/llvm-project/commit/1f4959b27607d4748c83820ffcf8bf24f09fdd47
DIFF: https://github.com/llvm/llvm-project/commit/1f4959b27607d4748c83820ffcf8bf24f09fdd47.diff

LOG: [Driver] Drop unneeded $triple/gcc/$triple detection

Added: 
    

Modified: 
    clang/lib/Driver/ToolChains/Gnu.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
index eb32f4b920b5..906bac57fa77 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -2532,12 +2532,6 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple(
        TargetTriple.getVendor() == llvm::Triple::Freescale ||
        TargetTriple.getVendor() == llvm::Triple::OpenEmbedded},
 
-      // Natively multiarch systems sometimes put the GCC triple-specific
-      // directory within their multiarch lib directory, resulting in the
-      // triple appearing twice.
-      {CandidateTriple.str() + "/gcc/" + CandidateTriple.str(), "../../..",
-       TargetTriple.getOS() != llvm::Triple::Solaris},
-
       // Deal with cases (on Ubuntu) where the system architecture could be i386
       // but the GCC target architecture could be (say) i686.
       // FIXME: It may be worthwhile to generalize this and look for a second