diff options
author | Chandler Carruth <chandlerc@gmail.com> | 2011-11-09 03:46:20 +0000 |
---|---|---|
committer | Chandler Carruth <chandlerc@gmail.com> | 2011-11-09 03:46:20 +0000 |
commit | d936d9d9abae0e5018fa0233aa51ac8390a6778f (patch) | |
tree | 1c9f1bf8fff78675534a3333921a47da40679715 /lib/Driver/ToolChains.h | |
parent | a59e4b7fca1d46afd8f315fa87fa8bf1a68df9cd (diff) |
Fix an issue that Duncan discovered on a specific (no longer current)
version of Ubuntu. It has a very broken multiarch configuration, and so
we need special logic to handle it correctly. Fixing and testing this
uncovered a few other trivial issues with the logic that are fixed as
well.
I added tests to cover this as it is hard to notice if you install
recent versions of the OS.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@144165 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/ToolChains.h')
-rw-r--r-- | lib/Driver/ToolChains.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h index 60453ebca4..d150a97693 100644 --- a/lib/Driver/ToolChains.h +++ b/lib/Driver/ToolChains.h @@ -100,7 +100,8 @@ protected: SmallVectorImpl<StringRef> &LibDirs, SmallVectorImpl<StringRef> &Triples); - void ScanLibDirForGCCTriple(const std::string &LibDir, + void ScanLibDirForGCCTriple(llvm::Triple::ArchType HostArch, + const std::string &LibDir, StringRef CandidateTriple); }; |