Use llvm6.0 instead of llvm-7 for now

This commit is contained in:
Josh Stone 2018-08-13 15:22:08 -07:00
parent 5eabb0b0b3
commit 1917fae5ec
1 changed files with 7 additions and 1 deletions

View File

@ -56,7 +56,7 @@
Name: rust Name: rust
Version: %{rustc_version} Version: %{rustc_version}
Release: 2%{?dist} Release: 3%{?dist}
Summary: The Rust Programming Language Summary: The Rust Programming Language
License: (ASL 2.0 or MIT) and (BSD and MIT) License: (ASL 2.0 or MIT) and (BSD and MIT)
# ^ written as: (rust itself) and (bundled libraries) # ^ written as: (rust itself) and (bundled libraries)
@ -154,6 +154,9 @@ BuildRequires: cmake >= 2.8.11
%if 0%{?epel} %if 0%{?epel}
%global llvm llvm5.0 %global llvm llvm5.0
%endif %endif
%if 0%{?fedora} >= 29
%global llvm llvm6.0
%endif
%if %defined llvm %if %defined llvm
%global llvm_root %{_libdir}/%{llvm} %global llvm_root %{_libdir}/%{llvm}
%else %else
@ -650,6 +653,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
%changelog %changelog
* Mon Aug 13 2018 Josh Stone <jistone@redhat.com> - 1.28.0-3
- Use llvm6.0 instead of llvm-7 for now
* Tue Aug 07 2018 Josh Stone <jistone@redhat.com> - 1.28.0-2 * Tue Aug 07 2018 Josh Stone <jistone@redhat.com> - 1.28.0-2
- Rebuild for LLVM ppc64/s390x fixes - Rebuild for LLVM ppc64/s390x fixes