[llvm-branch-commits] [cfe-tag] r84821 - /cfe/tags/Apple/clang-23.2/clang/tools/clang/lib/Driver/ToolChains.cpp

[Ted Kremenek]

Author: kremenek
Date: Wed Oct 21 20:02:12 2009
New Revision: 84821

URL: http://llvm.org/viewvc/llvm-project?rev=84821&view=rev
Log:
Merge in r84805.

Modified:
    cfe/tags/Apple/clang-23.2/clang/tools/clang/lib/Driver/ToolChains.cpp

Modified: cfe/tags/Apple/clang-23.2/clang/tools/clang/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang-23.2/clang/tools/clang/lib/Driver/ToolChains.cpp?rev=84821&r1=84820&r2=84821&view=diff

==============================================================================
--- cfe/tags/Apple/clang-23.2/clang/tools/clang/lib/Driver/ToolChains.cpp (original)
+++ cfe/tags/Apple/clang-23.2/clang/tools/clang/lib/Driver/ToolChains.cpp Wed Oct 21 20:02:12 2009
@@ -52,7 +52,8 @@
   ToolChainDir += llvm::utostr(GCCVersion[2]);
   
   // Try the next major version if that tool chain dir is invalid.
-  if (!llvm::sys::Path(ToolChainDir).exists()) {
+  std::string Tmp = "/usr/lib/gcc/" + ToolChainDir;
+  if (!llvm::sys::Path(Tmp).exists()) {
     std::string Next = "i686-apple-darwin";
     Next += llvm::utostr(DarwinVersion[0] + 1);
     Next += "/";
@@ -62,10 +63,11 @@
     Next += '.';
     Next += llvm::utostr(GCCVersion[2]);
 
-  // Use that if it exists, otherwise hope the user isn't linking.
-  //
-  // FIXME: Drop dependency on gcc's tool chain.
-    if (llvm::sys::Path(Next).exists())
+    // Use that if it exists, otherwise hope the user isn't linking.
+    //
+    // FIXME: Drop dependency on gcc's tool chain.
+    Tmp = "/usr/lib/gcc/" + Next;
+    if (llvm::sys::Path(Tmp).exists())
       ToolChainDir = Next;
   }