diff options
| author | Bill Wendling <isanbard@gmail.com> | 2014-08-27 20:07:31 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2014-08-27 20:07:31 +0000 |
| commit | 83f8b92b34b76d3a94d3499370068cf8dc85c80b (patch) | |
| tree | eb4a418aa5a0e9973c618611b8b42b7b02224acc | |
| parent | d2cd7c5902a610d49941db2594c2e017f5d0d6d2 (diff) | |
Merging r216572:upstream/llvmorg-3.5.0-rc4llvmorg-3.5.0-rc4
------------------------------------------------------------------------
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
3 files changed, 1 insertions, 1 deletions
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 --- /dev/null +++ b/clang/test/Driver/Inputs/gentoo_linux_gcc_4.6.2_tree/usr/include/.keep 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 --- /dev/null +++ b/clang/test/Driver/Inputs/gentoo_linux_gcc_4.6.4_tree/usr/include/.keep |