Commit 9eeddcf3 authored by Chandler Carruth's avatar Chandler Carruth
Browse files

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.
------------------------------------------------------------------------

llvm-svn: 143942
parent 8d9c0888

clang/lib/Driver/ToolChains.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1565,8 +1565,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
@@ -1576,6 +1575,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() == '/')

clang/lib/Driver/ToolChains.h

+0 −2
Original line number Diff line number Diff line
@@ -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);