From: Rafael Espindola Date: Fri, 25 Oct 2013 17:06:04 +0000 (+0000) Subject: Merge two adjacent ifs. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79cabd0793a624c1bc64c7c9e11575793c01b1e7;p=clang Merge two adjacent ifs. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@193419 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 12b3c4b491..89938ed22d 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -2426,12 +2426,11 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) // Try walking via the GCC triple path in case of biarch or multiarch GCC // installations with strange symlinks. - if (GCCInstallation.isValid()) + if (GCCInstallation.isValid()) { addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + "/../../" + Multilib, Paths); - // Add the non-multilib suffixed paths (if potentially different). - if (GCCInstallation.isValid()) { + // Add the non-multilib suffixed paths (if potentially different). const std::string &LibPath = GCCInstallation.getParentLibPath(); const llvm::Triple &GCCTriple = GCCInstallation.getTriple(); if (!GCCInstallation.getBiarchSuffix().empty())