replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch the Linux C++ standard library header search logic over to use 

the GCC installation's multiarch suffix now that it is exposed.

llvm-svn: 148938
This commit is contained in:
Chandler Carruth 2012-01-25 08:04:13 +00:00
parent 44d69d9c25
commit a1f1fd3b60
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2262,19 +2262,10 @@ void Linux::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
return;
}
// Check if the target architecture specific dirs need a suffix. Note that we
// only support the suffix-based bi-arch-like header scheme for host/target
// mismatches of just bit width.
// FIXME: This is using the Driver's target triple to emulate the host triple!
llvm::Triple::ArchType HostArch = getDriver().TargetTriple.getArch();
llvm::Triple::ArchType TargetArch = TargetTriple.getArch();
StringRef Suffix;
if ((HostArch == llvm::Triple::x86 && TargetArch == llvm::Triple::x86_64) ||
(HostArch == llvm::Triple::ppc && TargetArch == llvm::Triple::ppc64))
Suffix = "/64";
if ((HostArch == llvm::Triple::x86_64 && TargetArch == llvm::Triple::x86) ||
(HostArch == llvm::Triple::ppc64 && TargetArch == llvm::Triple::ppc))
Suffix = "/32";
// We need a detected GCC installation on Linux to provide libstdc++'s
// headers. We handled the libc++ case above.
if (!GCCInstallation.isValid())
return;
// By default, look for the C++ headers in an include directory adjacent to
// the lib directory of the GCC installation. Note that this is expect to be
@ -2283,12 +2274,14 @@ void Linux::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
StringRef InstallDir = GCCInstallation.getInstallPath();
StringRef Version = GCCInstallation.getVersion();
if (!addLibStdCXXIncludePaths(LibDir + "/../include/c++/" + Version,
GCCInstallation.getTriple().str() + Suffix,
(GCCInstallation.getTriple().str() +
GCCInstallation.getMultiarchSuffix()),
DriverArgs, CC1Args)) {
// Gentoo is weird and places its headers inside the GCC install, so if the
// first attempt to find the headers fails, try this pattern.
addLibStdCXXIncludePaths(InstallDir + "/include/g++-v4",
GCCInstallation.getTriple().str() + Suffix,
(GCCInstallation.getTriple().str() +
GCCInstallation.getMultiarchSuffix()),
DriverArgs, CC1Args);
}
}