summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/ToolChains.cpp
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2011-11-05 22:23:14 +0000
committerChandler Carruth <chandlerc@gmail.com>2011-11-05 22:23:14 +0000
commit4dfcf4ccf4fe8490bf0505fc677382c921558e73 (patch)
tree0a6024b0464a2673288f0b4f4f2c27fea1459c6f /clang/lib/Driver/ToolChains.cpp
parent2a750a0801e2d103a5e9db8da7d6cc5443511e23 (diff)
downloadbcm5719-llvm-4dfcf4ccf4fe8490bf0505fc677382c921558e73.tar.gz
bcm5719-llvm-4dfcf4ccf4fe8490bf0505fc677382c921558e73.zip
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: 143840
Diffstat (limited to 'clang/lib/Driver/ToolChains.cpp')
-rw-r--r--clang/lib/Driver/ToolChains.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 6cdd2f7afd6..f0c0650cc12 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/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() == '/')
OpenPOWER on IntegriCloud