summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/ToolChains.cpp
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2010-08-02 05:43:59 +0000
committerDaniel Dunbar <daniel@zuster.org>2010-08-02 05:43:59 +0000
commita18a4876334fa35de3fcd3d00c6ac8b8edd6fbc4 (patch)
tree99f1c08c4428b9ec711bb7589c6910c072570c8c /clang/lib/Driver/ToolChains.cpp
parentcc7df6cc7b00d9b43d0991f0f1006d4c078f7581 (diff)
downloadbcm5719-llvm-a18a4876334fa35de3fcd3d00c6ac8b8edd6fbc4.tar.gz
bcm5719-llvm-a18a4876334fa35de3fcd3d00c6ac8b8edd6fbc4.zip
Driver/FreeBSD: Change how FreeBSD derives the Lib32 variable, to normalize tool
chain construction. llvm-svn: 110025
Diffstat (limited to 'clang/lib/Driver/ToolChains.cpp')
-rw-r--r--clang/lib/Driver/ToolChains.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index bdccc3e3da2..5a4ad6023c9 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -889,8 +889,16 @@ Tool &OpenBSD::SelectTool(const Compilation &C, const JobAction &JA) const {
/// FreeBSD - FreeBSD tool chain which can call as(1) and ld(1) directly.
-FreeBSD::FreeBSD(const HostInfo &Host, const llvm::Triple& Triple, bool Lib32)
+FreeBSD::FreeBSD(const HostInfo &Host, const llvm::Triple& Triple)
: Generic_GCC(Host, Triple) {
+
+ // Determine if we are compiling 32-bit code on an x86_64 platform.
+ bool Lib32 = false;
+ if (Triple.getArch() == llvm::Triple::x86 &&
+ llvm::Triple(getDriver().DefaultHostTriple).getArch() ==
+ llvm::Triple::x86_64)
+ Lib32 = true;
+
getProgramPaths().push_back(getDriver().Dir + "/../libexec");
getProgramPaths().push_back("/usr/libexec");
if (Lib32) {
OpenPOWER on IntegriCloud