[llvm-branch-commits] [cfe-branch] r216588 - Merging r216572:

[Bill Wendling]

Author: void
Date: Wed Aug 27 15:07:31 2014
New Revision: 216588

URL: http://llvm.org/viewvc/llvm-project?rev=216588&view=rev
Log:
Merging r216572:
------------------------------------------------------------------------
r216572 | chandlerc | 2014-08-27 11:21:27 -0700 (Wed, 27 Aug 2014) | 3 lines

Fix PR20773 which I introduced with a silly edit mistake in r216531.
Trivial fix, and I've made the gentoo tests more representative. With
the changes, they would have caught this failure.
------------------------------------------------------------------------

Added:
    cfe/branches/release_35/test/Driver/Inputs/gentoo_linux_gcc_4.6.2_tree/usr/include/
      - copied from r216572, cfe/trunk/test/Driver/Inputs/gentoo_linux_gcc_4.6.2_tree/usr/include/
    cfe/branches/release_35/test/Driver/Inputs/gentoo_linux_gcc_4.6.4_tree/usr/include/
      - copied from r216572, cfe/trunk/test/Driver/Inputs/gentoo_linux_gcc_4.6.4_tree/usr/include/
Modified:
    cfe/branches/release_35/   (props changed)
    cfe/branches/release_35/lib/Driver/ToolChains.cpp

Propchange: cfe/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 27 15:07:31 2014
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:213609,213611,213613,213741,213834,213840,213902,213912-213913,213993,213998-213999,214008,214050,214060,214119,214208,214222,214369,214390,214471,214734-214735,214777,215046,215229,215245,215609,215618,215806-215808,216531
+/cfe/trunk:213609,213611,213613,213741,213834,213840,213902,213912-213913,213993,213998-213999,214008,214050,214060,214119,214208,214222,214369,214390,214471,214734-214735,214777,215046,215229,215245,215609,215618,215806-215808,216531,216572
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_35/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_35/lib/Driver/ToolChains.cpp?rev=216588&r1=216587&r2=216588&view=diff
==============================================================================
--- cfe/branches/release_35/lib/Driver/ToolChains.cpp (original)
+++ cfe/branches/release_35/lib/Driver/ToolChains.cpp Wed Aug 27 15:07:31 2014
@@ -3394,7 +3394,7 @@ void Linux::AddClangSystemIncludeArgs(co
                                                 Twine IncludeSuffix,
                                                 const ArgList &DriverArgs,
                                                 ArgStringList &CC1Args) {
-  if (!llvm::sys::fs::exists(Base))
+  if (!llvm::sys::fs::exists(Base + Suffix))
     return false;
 
   addSystemInclude(DriverArgs, CC1Args, Base + Suffix);