[cfe-commits] r143840 - in /cfe/trunk/lib/Driver: ToolChains.cpp ToolChains.h

Chandler Carruth chandlerc at gmail.com
Sat Nov 5 15:23:14 PDT 2011


Author: chandlerc
Date: Sat Nov  5 17:23:14 2011
New Revision: 143840

URL: http://llvm.org/viewvc/llvm-project?rev=143840&view=rev
Log:
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.

Modified:
    cfe/trunk/lib/Driver/ToolChains.cpp
    cfe/trunk/lib/Driver/ToolChains.h

Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=143840&r1=143839&r2=143840&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Sat Nov  5 17:23:14 2011
@@ -1563,8 +1563,7 @@
 /// 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 @@
   // 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() == '/')

Modified: cfe/trunk/lib/Driver/ToolChains.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.h?rev=143840&r1=143839&r2=143840&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.h (original)
+++ cfe/trunk/lib/Driver/ToolChains.h Sat Nov  5 17:23:14 2011
@@ -389,8 +389,6 @@
     std::string GccInstallPath;
     std::string GccParentLibPath;
 
-    llvm::SmallString<128> CxxIncludeRoot;
-
   public:
     GCCInstallationDetector(const Driver &D);
 





More information about the cfe-commits mailing list