From 59097b6b9aefcd6dc35d905c560e6cab5beb8160 Mon Sep 17 00:00:00 2001 From: Simon Atanasyan Date: Tue, 26 Nov 2013 11:57:09 +0000 Subject: [PATCH] [Mips] Call findMIPSABIDirSuffix() for MIPS targets only. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@195750 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/ToolChains.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 09afc1e02e..b5f4c19b5c 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -1386,9 +1386,6 @@ static bool findTargetBiarchSuffix(std::string &Suffix, StringRef Path, void Generic_GCC::GCCInstallationDetector::findMIPSABIDirSuffix( std::string &Suffix, llvm::Triple::ArchType TargetArch, StringRef Path, const llvm::opt::ArgList &Args) { - if (!isMipsArch(TargetArch)) - return; - // Some MIPS toolchains put libraries and object files compiled // using different options in to the sub-directoris which names // reflects the flags used for compilation. For example sysroot @@ -1523,7 +1520,8 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple( continue; std::string MIPSABIDirSuffix; - findMIPSABIDirSuffix(MIPSABIDirSuffix, TargetArch, LI->path(), Args); + if (isMipsArch(TargetArch)) + findMIPSABIDirSuffix(MIPSABIDirSuffix, TargetArch, LI->path(), Args); // Some versions of SUSE and Fedora on ppc64 put 32-bit libs // in what would normally be GCCInstallPath and put the 64-bit -- 2.40.0