Merging r143897:

chandlerc · chandlerc · commit 02591c29cfe1 · 2011-11-07T10:43:59.000Z
------------------------------------------------------------------------
r143897 | chandlerc | 2011-11-06 15:10:49 -0800 (Sun, 06 Nov 2011) | 2 lines

Remove an old OpenSUSE hack that is no longer needed -- it is exactly
the same as a directory added further down in the new logic.
------------------------------------------------------------------------

llvm-svn: 143954
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
@@ -1848,11 +1848,6 @@ Linux::Linux(const HostInfo &Host, const llvm::Triple &Triple)
   if (GCCInstallation.isValid()) {
     const std::string &LibPath = GCCInstallation.getParentLibPath();
     const std::string &GccTriple = GCCInstallation.getTriple();
-    // FIXME: This OpenSuse-specific path shouldn't be needed any more, but
-    // I don't want to remove it without finding someone to test.
-    if (IsOpenSuse(Distro) && Is32Bits)
-      Paths.push_back(LibPath + "/../" + GccTriple + "/lib/../lib");
-
     addPathIfExists(GCCInstallation.getInstallPath() + Suffix, Paths);
     addPathIfExists(LibPath + "/../" + GccTriple + "/lib/../" + Multilib,
                     Paths);
