Commit 8d9c0888 authored by Chandler Carruth's avatar Chandler Carruth
Browse files

Merging r143839: 

------------------------------------------------------------------------
r143839 | chandlerc | 2011-11-05 15:23:11 -0700 (Sat, 05 Nov 2011) | 2 lines

Remove a no-longer needed helper function. Thanks for implementing this
Michael!
------------------------------------------------------------------------

llvm-svn: 143941
parent bec38f0d

clang/lib/Driver/ToolChains.cpp

+4 −12
Original line number Diff line number Diff line
@@ -1521,14 +1521,6 @@ static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) { 
  return UnknownDistro;

}



/// \brief Trivial helper function to simplify code checking path existence.

static bool PathExists(StringRef Path) {

  bool Exists;

  if (!llvm::sys::fs::exists(Path, Exists))

    return Exists;

  return false;

}



/// \brief Struct to store and manipulate GCC versions.

///

/// We rely on assumptions about the form and structure of GCC version
@@ -1624,11 +1616,11 @@ Linux::GCCInstallationDetector::GCCInstallationDetector(const Driver &D) 
  // installation available. GCC installs are ranked by version number.

  GCCVersion BestVersion = {0, 0, 0};

  for (unsigned i = 0, ie = Prefixes.size(); i < ie; ++i) {

    if (!PathExists(Prefixes[i]))

    if (!llvm::sys::fs::exists(Prefixes[i]))

      continue;

    for (unsigned j = 0, je = CandidateLibDirs.size(); j < je; ++j) {

      const std::string LibDir = Prefixes[i] + CandidateLibDirs[j].str();

      if (!PathExists(LibDir))

      if (!llvm::sys::fs::exists(LibDir))

        continue;

      for (unsigned k = 0, ke = CandidateTriples.size(); k < ke; ++k)

        ScanLibDirForGCCTriple(LibDir, CandidateTriples[k], BestVersion);
@@ -1731,7 +1723,7 @@ void Linux::GCCInstallationDetector::ScanLibDirForGCCTriple( 
        continue;

      if (CandidateVersion <= BestVersion)

        continue;

      if (!PathExists(LI->path() + "/crtbegin.o"))

      if (!llvm::sys::fs::exists(LI->path() + "/crtbegin.o"))

        continue;



      BestVersion = CandidateVersion;
@@ -1748,7 +1740,7 @@ void Linux::GCCInstallationDetector::ScanLibDirForGCCTriple( 


static void addPathIfExists(const std::string &Path,

                            ToolChain::path_list &Paths) {

  if (PathExists(Path)) Paths.push_back(Path);

  if (llvm::sys::fs::exists(Path)) Paths.push_back(Path);

}



/// \brief Get our best guess at the multiarch triple for a target.