Driver: Setup file and program search paths in tool chains.

llvm-svn: 67529

4 files changed, 90 insertions, 12 deletions

diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index db084262e9c..df71c97215a 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -920,15 +920,8 @@ llvm::sys::Path Driver::GetProgramPath(const char *Name,
       return P;
   }
 
-  // As a last resort, always search in our directory before pulling
-  // from the path.
-  llvm::sys::Path P(Dir);
-  P.appendComponent(Name);
-  if (P.exists())
-    return P;
-
-  // Search path to increase accuracy of logging output.
-  P = llvm::sys::Program::FindProgramByName(Name);
+  // If all else failed, search the path.
+  llvm::sys::Path P(llvm::sys::Program::FindProgramByName(Name));
   if (!P.empty())
     return P;
 
diff --git a/clang/lib/Driver/HostInfo.cpp b/clang/lib/Driver/HostInfo.cpp
index 8c24a3c707b..8f762095b61 100644
--- a/clang/lib/Driver/HostInfo.cpp
+++ b/clang/lib/Driver/HostInfo.cpp
@@ -159,7 +159,9 @@ ToolChain *DarwinHostInfo::getToolChain(const ArgList &Args,
     if (strcmp(ArchName, "i386") == 0 || strcmp(ArchName, "x86_64") == 0)
       TC = new toolchains::Darwin_X86(*this, ArchName, 
                                       getPlatformName().c_str(), 
-                                      getOSName().c_str());
+                                      getOSName().c_str(),
+                                      DarwinVersion,
+                                      GCCVersion);
     else
       TC = new toolchains::Darwin_GCC(*this, ArchName, 
                                       getPlatformName().c_str(), 
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 3165a8f395e..eac72ee65a7 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -9,11 +9,74 @@
 
 #include "ToolChains.h"
 
+#include "clang/Driver/Driver.h"
+#include "clang/Driver/HostInfo.h"
+
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/System/Path.h"
+
 using namespace clang::driver;
 using namespace clang::driver::toolchains;
 
 /// Darwin_X86 - Darwin tool chain for i386 and x86_64.
 
+Darwin_X86::Darwin_X86(const HostInfo &Host, const char *Arch, 
+                       const char *Platform, const char *OS, 
+                       const unsigned (&_DarwinVersion)[3],
+                       const unsigned (&_GCCVersion)[3])
+  : ToolChain(Host, Arch, Platform, OS) 
+{
+  DarwinVersion[0] = _DarwinVersion[0];
+  DarwinVersion[1] = _DarwinVersion[1];
+  DarwinVersion[2] = _DarwinVersion[2];
+  GCCVersion[0] = _GCCVersion[0];
+  GCCVersion[1] = _GCCVersion[1];
+  GCCVersion[2] = _GCCVersion[2];
+
+  ToolChainDir = "i686-apple-darwin";
+  ToolChainDir += llvm::utostr(DarwinVersion[0]);
+  ToolChainDir += "/";
+  ToolChainDir += llvm::utostr(GCCVersion[0]);
+  ToolChainDir += '.';
+  ToolChainDir += llvm::utostr(GCCVersion[1]);
+  ToolChainDir += '.';
+  ToolChainDir += llvm::utostr(GCCVersion[2]);
+
+  std::string Path;
+  if (getArchName() == "x86_64") {
+    Path = getHost().getDriver().Dir;
+    Path += "/../lib/gcc/";
+    Path += getToolChainDir();
+    Path += "/x86_64";
+    getFilePaths().push_back(Path);
+
+    Path = "/usr/lib/gcc/";
+    Path += getToolChainDir();
+    Path += "/x86_64";
+    getFilePaths().push_back(Path);
+  }
+  
+  Path = getHost().getDriver().Dir;
+  Path += "/../lib/gcc/";
+  Path += getToolChainDir();
+  getFilePaths().push_back(Path);
+
+  Path = "/usr/lib/gcc/";
+  Path += getToolChainDir();
+  getFilePaths().push_back(Path);
+
+  Path = getHost().getDriver().Dir;
+  Path += "/../libexec/gcc/";
+  Path += getToolChainDir();
+  getProgramPaths().push_back(Path);
+
+  Path = "/usr/libexec/gcc/";
+  Path += getToolChainDir();
+  getProgramPaths().push_back(Path);
+
+  getProgramPaths().push_back(getHost().getDriver().Dir);
+}
+
 Darwin_X86::~Darwin_X86() {
   // Free tool implementations.
   for (llvm::DenseMap<unsigned, Tool*>::iterator
@@ -84,6 +147,13 @@ const char *Darwin_X86::GetForcedPicModel() const {
 /// all subcommands; this relies on gcc translating the majority of
 /// command line options.
 
+Generic_GCC::Generic_GCC(const HostInfo &Host, const char *Arch, 
+                         const char *Platform, const char *OS)
+  : ToolChain(Host, Arch, Platform, OS) 
+{
+  getProgramPaths().push_back(getHost().getDriver().Dir);  
+}
+
 Generic_GCC::~Generic_GCC() {
   // Free tool implementations.
   for (llvm::DenseMap<unsigned, Tool*>::iterator
diff --git a/clang/lib/Driver/ToolChains.h b/clang/lib/Driver/ToolChains.h
index 9e196e02f22..ea1661a970e 100644
--- a/clang/lib/Driver/ToolChains.h
+++ b/clang/lib/Driver/ToolChains.h
@@ -30,7 +30,7 @@ class VISIBILITY_HIDDEN Generic_GCC : public ToolChain {
 
 public:
   Generic_GCC(const HostInfo &Host, const char *Arch, const char *Platform, 
-              const char *OS) : ToolChain(Host, Arch, Platform, OS) {}
+              const char *OS);
   ~Generic_GCC();
 
   virtual ArgList *TranslateArgs(ArgList &Args) const { return &Args; }
@@ -47,9 +47,19 @@ public:
 class VISIBILITY_HIDDEN Darwin_X86 : public ToolChain {
   mutable llvm::DenseMap<unsigned, Tool*> Tools;
 
+  /// Darwin version of tool chain.
+  unsigned DarwinVersion[3];
+
+  /// GCC version to use.
+  unsigned GCCVersion[3];
+
+  /// The directory suffix for this tool chain.
+  std::string ToolChainDir;
+
 public:
   Darwin_X86(const HostInfo &Host, const char *Arch, const char *Platform, 
-             const char *OS) : ToolChain(Host, Arch, Platform, OS) {}
+             const char *OS, const unsigned (&DarwinVersion)[3],
+             const unsigned (&GCCVersion)[3]);
   ~Darwin_X86();
 
   virtual ArgList *TranslateArgs(ArgList &Args) const;
@@ -60,6 +70,9 @@ public:
   virtual bool IsUnwindTablesDefault() const;
   virtual const char *GetDefaultRelocationModel() const;
   virtual const char *GetForcedPicModel() const;
+
+private:
+  const std::string &getToolChainDir() const { return ToolChainDir; }
 };
 
   /// Darwin_GCC - Generic Darwin tool chain using gcc.