[llvm-branch-commits] [cfe-branch] r143942 - in /cfe/branches/release_30: ./ lib/Driver/ToolChains.cpp lib/Driver/ToolChains.h

[Chandler Carruth]

Author: chandlerc
Date: Mon Nov  7 04:31:25 2011
New Revision: 143942

URL: http://llvm.org/viewvc/llvm-project?rev=143942&view=rev
Log:
Merging r143840:
------------------------------------------------------------------------
r143840 | chandlerc | 2011-11-05 15:23:14 -0700 (Sat, 05 Nov 2011) | 4 lines

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/branches/release_30/   (props changed)
    cfe/branches/release_30/lib/Driver/ToolChains.cpp
    cfe/branches/release_30/lib/Driver/ToolChains.h

Propchange: cfe/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  7 04:31:25 2011
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142918,143344-143345,143684,143686-143687,143751-143752,143798,143801,143804-143807,143822-143823,143836,143838-143839
+/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142918,143344-143345,143684,143686-143687,143751-143752,143798,143801,143804-143807,143822-143823,143836,143838-143840
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_30/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_30/lib/Driver/ToolChains.cpp?rev=143942&r1=143941&r2=143942&view=diff
==============================================================================
--- cfe/branches/release_30/lib/Driver/ToolChains.cpp (original)
+++ cfe/branches/release_30/lib/Driver/ToolChains.cpp Mon Nov  7 04:31:25 2011
@@ -1565,8 +1565,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
@@ -1576,6 +1575,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/branches/release_30/lib/Driver/ToolChains.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_30/lib/Driver/ToolChains.h?rev=143942&r1=143941&r2=143942&view=diff
==============================================================================
--- cfe/branches/release_30/lib/Driver/ToolChains.h (original)
+++ cfe/branches/release_30/lib/Driver/ToolChains.h Mon Nov  7 04:31:25 2011
@@ -389,8 +389,6 @@
     std::string GccInstallPath;
     std::string GccParentLibPath;
 
-    llvm::SmallString<128> CxxIncludeRoot;
-
   public:
     GCCInstallationDetector(const Driver &D);