1 files changed, 15 insertions, 2 deletions
diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
index 9e196e02f2..ea1661a970 100644
--- a/lib/Driver/ToolChains.h
+++ b/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.