summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/ToolChains.cpp
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2009-10-22 00:12:00 +0000
committerDaniel Dunbar <daniel@zuster.org>2009-10-22 00:12:00 +0000
commit820782aae0f08bffe69d28448e41ffa96a3abdab (patch)
treeb84bf9fd8133467665f68b6d2db2ac345d40237f /clang/lib/Driver/ToolChains.cpp
parentdcb99d310a39fae86e62133d898550f62ddb50c1 (diff)
downloadbcm5719-llvm-820782aae0f08bffe69d28448e41ffa96a3abdab.tar.gz
bcm5719-llvm-820782aae0f08bffe69d28448e41ffa96a3abdab.zip
Driver: Fix thinko in logic for finding gcc's tool chain directory.
llvm-svn: 84805
Diffstat (limited to 'clang/lib/Driver/ToolChains.cpp')
-rw-r--r--clang/lib/Driver/ToolChains.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 398e5dddbf3..ae8119d33d6 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -65,7 +65,8 @@ DarwinGCC::DarwinGCC(const HostInfo &Host, const llvm::Triple& Triple,
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 += "/";
@@ -78,7 +79,8 @@ DarwinGCC::DarwinGCC(const HostInfo &Host, const llvm::Triple& Triple,
// 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())
+ Tmp = "/usr/lib/gcc/" + Next;
+ if (llvm::sys::Path(Tmp).exists())
ToolChainDir = Next;
}
OpenPOWER on IntegriCloud