maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Only print the selected multilib when something is actually found on the host. 

llvm-svn: 201709
This commit is contained in:
Yunzhong Gao 2014-02-19 19:06:58 +00:00
parent c30e764942
commit e3f902c32a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/include/clang/Driver/Multilib.h
View File

@ -82,6 +82,10 @@ public:
/// Check whether any of the 'against' flags contradict the 'for' flags. /// Check whether any of the 'against' flags contradict the 'for' flags.
bool isValid() const; bool isValid() const;
/// Check whether the default is selected
bool isDefault() const
{ return GCCSuffix.empty() && OSSuffix.empty() && IncludeSuffix.empty(); }
bool operator==(const Multilib &Other) const; bool operator==(const Multilib &Other) const;
}; };

4
clang/lib/Driver/ToolChains.cpp
View File

@ -1263,11 +1263,15 @@ void Generic_GCC::GCCInstallationDetector::print(raw_ostream &OS) const {
I != E; ++I) I != E; ++I)
OS << "Found candidate GCC installation: " << *I << "\n"; OS << "Found candidate GCC installation: " << *I << "\n";
if (!GCCInstallPath.empty())
OS << "Selected GCC installation: " << GCCInstallPath << "\n"; OS << "Selected GCC installation: " << GCCInstallPath << "\n";
for (MultilibSet::const_iterator I = Multilibs.begin(), E = Multilibs.end(); for (MultilibSet::const_iterator I = Multilibs.begin(), E = Multilibs.end();
I != E; ++I) { I != E; ++I) {
OS << "Candidate multiilb: " << *I << "\n"; OS << "Candidate multiilb: " << *I << "\n";
} }
if (Multilibs.size() != 0 || !SelectedMultilib.isDefault())
OS << "Selected multilib: " << SelectedMultilib << "\n"; OS << "Selected multilib: " << SelectedMultilib << "\n";
} }