From 4dfcf4ccf4fe8490bf0505fc677382c921558e73 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Sat, 5 Nov 2011 22:23:14 +0000 Subject: [PATCH] Remove a pointless member. I have no idea why I made this not a local variable to begin with... As I'm planning to add include root information to this object, this would have caused confusion. It didn't even *actually* hold the include root by the time we were done with it. llvm-svn: 143840 --- clang/lib/Driver/ToolChains.cpp | 4 ++-- clang/lib/Driver/ToolChains.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 6cdd2f7afd6e..f0c0650cc12e 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -1563,8 +1563,7 @@ struct Linux::GCCVersion { /// Once constructed, a GCCInstallation is esentially immutable. Linux::GCCInstallationDetector::GCCInstallationDetector(const Driver &D) : IsValid(false), - GccTriple(D.DefaultHostTriple), - CxxIncludeRoot(CXX_INCLUDE_ROOT) { + GccTriple(D.DefaultHostTriple) { // FIXME: Using CXX_INCLUDE_ROOT is here is a bit of a hack, but // avoids adding yet another option to configure/cmake. // It would probably be cleaner to break it in two variables @@ -1574,6 +1573,7 @@ Linux::GCCInstallationDetector::GCCInstallationDetector(const Driver &D) // CXX_INCLUDE_ROOT = CXX_GCC_ROOT/include/c++/CXX_GCC_VER // and this function would return // CXX_GCC_ROOT/lib/gcc/CXX_INCLUDE_ARCH/CXX_GCC_VER + llvm::SmallString<128> CxxIncludeRoot(CXX_INCLUDE_ROOT); if (CxxIncludeRoot != "") { // This is of the form /foo/bar/include/c++/4.5.2/ if (CxxIncludeRoot.back() == '/') diff --git a/clang/lib/Driver/ToolChains.h b/clang/lib/Driver/ToolChains.h index dbf95d0b99ae..0ae0e53496da 100644 --- a/clang/lib/Driver/ToolChains.h +++ b/clang/lib/Driver/ToolChains.h @@ -389,8 +389,6 @@ class LLVM_LIBRARY_VISIBILITY Linux : public Generic_ELF { std::string GccInstallPath; std::string GccParentLibPath; - llvm::SmallString<128> CxxIncludeRoot; - public: GCCInstallationDetector(const Driver &D);