diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2011-11-07 10:31:25 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2011-11-07 10:31:25 +0000 |
| commit | 45dcbd9a6cf19f73a0e7856a92e3bace2c5d3366 (patch) | |
| tree | ea55da4644ba1bbb78e8df4c7eea029ee77ab2aa | |
| parent | 1830f6b0229f487121fa320c7563768c32fc284f (diff) | |
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.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_30@143942 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 4 | ||||
| -rw-r--r-- | lib/Driver/ToolChains.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index a89e0314b5..266d034a23 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -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() == '/') diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h index dbf95d0b99..0ae0e53496 100644 --- 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); |