From a6a15dde5a870f0ce6be0ea26d36cec60e846a2d Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Fri, 19 Mar 2021 22:50:35 -0700 Subject: [PATCH] [Driver] Delete toplevel i386-gnu/gcc detection in favor of i386-gnu alias triple detection This is used by hurd.c (usr/lib/gcc/i386-gnu/4.6.0) but we can leverage the existing alias triple detection. --- clang/lib/Driver/ToolChains/Gnu.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp index 906bac5..3c1fc87 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -2538,9 +2538,6 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple( // triple. {"i386-linux-gnu/gcc/" + CandidateTriple.str(), "../../..", (TargetArch == llvm::Triple::x86 && - TargetTriple.getOS() != llvm::Triple::Solaris)}, - {"i386-gnu/gcc/" + CandidateTriple.str(), "../../..", - (TargetArch == llvm::Triple::x86 && TargetTriple.getOS() != llvm::Triple::Solaris)}}; for (auto &Suffix : Suffixes) { -- 2.7.4