This commit is contained in:
Jakub Jelinek 2015-02-18 20:10:28 +01:00
parent 1f56909754
commit ca2a27c7f8
2 changed files with 21 additions and 1 deletions

14
clang-pr22625.patch Normal file
View File

@ -0,0 +1,14 @@
Index: lib/Driver/ToolChains.cpp
===================================================================
--- lib/Driver/ToolChains.cpp (revision 229718)
+++ lib/Driver/ToolChains.cpp (revision 229719)
@@ -3154,7 +3154,8 @@
SmallVector<StringRef, 5> dirs;
CIncludeDirs.split(dirs, ":");
for (StringRef dir : dirs) {
- StringRef Prefix = llvm::sys::path::is_absolute(dir) ? SysRoot : "";
+ StringRef Prefix =
+ llvm::sys::path::is_absolute(dir) ? StringRef(SysRoot) : "";
addExternCSystemInclude(DriverArgs, CC1Args, Prefix + dir);
}
return;

View File

@ -35,7 +35,7 @@
Name: llvm Name: llvm
Version: 3.5.0 Version: 3.5.0
Release: 10%{?dist} Release: 11%{?dist}
Summary: The Low Level Virtual Machine Summary: The Low Level Virtual Machine
Group: Development/Languages Group: Development/Languages
@ -74,6 +74,8 @@ Patch3: llvm-IntrusiveRefCntPtr.patch
# be to build everything herein with gcc, but i don't have the patience # be to build everything herein with gcc, but i don't have the patience
# atm, so in the interest of bootstrapping... # atm, so in the interest of bootstrapping...
Patch100: clang-fake-gcc43.patch Patch100: clang-fake-gcc43.patch
# http://llvm.org/bugs/show_bug.cgi?id=22625
Patch101: clang-pr22625.patch
Patch200: lldb-python.patch Patch200: lldb-python.patch
Patch201: lldb-fix-expression-parser.patch Patch201: lldb-fix-expression-parser.patch
@ -331,6 +333,7 @@ mv lldb-*/ tools/lldb
%if %{with clang} %if %{with clang}
pushd tools/clang pushd tools/clang
%patch100 -p1 %patch100 -p1
%patch101 -p1
popd popd
%endif %endif
@ -699,6 +702,9 @@ exit 0
%endif %endif
%changelog %changelog
* Wed Feb 18 2015 Jonathan Wakely <jwakely@redhat.com> - 3.5.0-11
- Add patch for http://llvm.org/bugs/show_bug.cgi?id=22625
* Wed Feb 18 2015 Richard W.M. Jones <rjones@redhat.com> - 3.5.0-10 * Wed Feb 18 2015 Richard W.M. Jones <rjones@redhat.com> - 3.5.0-10
- Bump release and rebuild. - Bump release and rebuild.