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

[Chandler Carruth]

Author: chandlerc
Date: Mon Nov  7 04:43:59 2011
New Revision: 143954

URL: http://llvm.org/viewvc/llvm-project?rev=143954&view=rev
Log:
Merging r143897:
------------------------------------------------------------------------
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.
------------------------------------------------------------------------

Modified:
    cfe/branches/release_30/   (props changed)
    cfe/branches/release_30/lib/Driver/ToolChains.cpp

Propchange: cfe/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  7 04:43:59 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-143842,143863,143866,143869,143871,143873-143875,143896
+/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-143842,143863,143866,143869,143871,143873-143875,143896-143897
 /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=143954&r1=143953&r2=143954&view=diff
==============================================================================
--- cfe/branches/release_30/lib/Driver/ToolChains.cpp (original)
+++ cfe/branches/release_30/lib/Driver/ToolChains.cpp Mon Nov  7 04:43:59 2011
@@ -1848,11 +1848,6 @@
   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);