aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Driver/ToolChain.cpp
diff options
context:
space:
mode:
authorPetr Hosek <phosek@google.com>2020-10-02 16:59:28 -0700
committerPetr Hosek <phosek@google.com>2020-10-02 16:59:28 -0700
commit9a48411f35a122ac8755a8453887b919c77daf3f (patch)
tree487c47f20dafcc55f0de16a4f220e6f6889070fd /clang/lib/Driver/ToolChain.cpp
parent2cd75f738ec6b150719a9468372d77b7064ff340 (diff)
downloadllvm-9a48411f35a122ac8755a8453887b919c77daf3f.zip
llvm-9a48411f35a122ac8755a8453887b919c77daf3f.tar.gz
llvm-9a48411f35a122ac8755a8453887b919c77daf3f.tar.bz2
Revert "[Driver] Move detectLibcxxIncludePath to ToolChain"
This reverts commit a594fd28e373cb7cd348cf01f6a90e055bf6cf6d which is failign on some bots.
Diffstat (limited to 'clang/lib/Driver/ToolChain.cpp')
-rw-r--r--clang/lib/Driver/ToolChain.cpp23
1 files changed, 0 insertions, 23 deletions
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 8e98e32..8991216 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -924,29 +924,6 @@ void ToolChain::addExternCSystemIncludeIfExists(const ArgList &DriverArgs,
}
}
-std::string ToolChain::detectLibcxxIncludePath(StringRef Base) const {
- std::error_code EC;
- int MaxVersion = 0;
- std::string MaxVersionString;
- for (llvm::vfs::directory_iterator LI = getVFS().dir_begin(Base, EC), LE;
- !EC && LI != LE; LI = LI.increment(EC)) {
- StringRef VersionText = llvm::sys::path::filename(LI->path());
- int Version;
- if (VersionText[0] == 'v' &&
- !VersionText.slice(1, StringRef::npos).getAsInteger(10, Version)) {
- if (Version > MaxVersion) {
- MaxVersion = Version;
- MaxVersionString = std::string(VersionText);
- }
- }
- }
- if (!MaxVersion)
- return "";
- SmallString<128> P(Base);
- llvm::sys::path::append(P, MaxVersionString);
- return std::string(P.str());
-}
-
void ToolChain::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
ArgStringList &CC1Args) const {
// Header search paths should be handled by each of the subclasses.