From 83f8b92b34b76d3a94d3499370068cf8dc85c80b Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Wed, 27 Aug 2014 20:07:31 +0000 Subject: 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. ------------------------------------------------------------------------ llvm-svn: 216588 --- clang/lib/Driver/ToolChains.cpp | 2 +- clang/test/Driver/Inputs/gentoo_linux_gcc_4.6.2_tree/usr/include/.keep | 0 clang/test/Driver/Inputs/gentoo_linux_gcc_4.6.4_tree/usr/include/.keep | 0 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 clang/test/Driver/Inputs/gentoo_linux_gcc_4.6.2_tree/usr/include/.keep create mode 100644 clang/test/Driver/Inputs/gentoo_linux_gcc_4.6.4_tree/usr/include/.keep diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 9b79c9a3d763..b46f69de96a3 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/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/clang/test/Driver/Inputs/gentoo_linux_gcc_4.6.2_tree/usr/include/.keep b/clang/test/Driver/Inputs/gentoo_linux_gcc_4.6.2_tree/usr/include/.keep new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/clang/test/Driver/Inputs/gentoo_linux_gcc_4.6.4_tree/usr/include/.keep b/clang/test/Driver/Inputs/gentoo_linux_gcc_4.6.4_tree/usr/include/.keep new file mode 100644 index 000000000000..e69de29bb2d1 -- cgit v1.2.3