From: Bill Wendling Date: Wed, 27 Aug 2014 20:07:31 +0000 (+0000) Subject: Merging r216572: X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c30a4d47897f6a34f3ca40d47d09cc72671381cb;p=clang 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. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_35@216588 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 9b79c9a3d7..b46f69de96 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -3394,7 +3394,7 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs, 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); diff --git a/test/Driver/Inputs/gentoo_linux_gcc_4.6.2_tree/usr/include/.keep b/test/Driver/Inputs/gentoo_linux_gcc_4.6.2_tree/usr/include/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/Driver/Inputs/gentoo_linux_gcc_4.6.4_tree/usr/include/.keep b/test/Driver/Inputs/gentoo_linux_gcc_4.6.4_tree/usr/include/.keep new file mode 100644 index 0000000000..e69de29bb2