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.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@143840 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 6cdd2f7afd6e20078ccae14f0c7061e683d6c1a3..f0c0650cc12e01f5d6c8c6915a0e48375cf8b7c2 100644 (file)
--- a/lib/Driver/ToolChains.cpp
+++ b/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/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
index dbf95d0b99ae755a228a29648a4c2b869e3ec1b6..0ae0e53496da8063992b37ab80ee382539e2826e 100644 (file)
--- a/lib/Driver/ToolChains.h
+++ b/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);