diff --git a/rust.spec b/rust.spec index 101266bc12d7095aebe75788f186edf6e68fc1d7..6cfbee03d629230ad0935e2950d53d52f6a8566d 100644 --- a/rust.spec +++ b/rust.spec @@ -4,7 +4,7 @@ %global bootstrap_date 2024-10-17 %global bootstrap_arches x86_64 aarch64 riscv64 %bcond_with llvm_static -%ifarch x86_64 aarch64 +%ifarch x86_64 aarch64 riscv64 %bcond_with bundled_llvm %else %bcond_without bundled_llvm @@ -26,7 +26,7 @@ Name: rust Version: 1.82.0 -Release: 9 +Release: 10 Summary: The Rust Programming Language License: Apache-2.0 OR MIT URL: https://www.rust-lang.org @@ -124,7 +124,7 @@ BuildRequires: cmake >= 2.8.11 %global llvm_root %{_libdir}/%{llvm} %else # default llvm is decent enough on riscv64 -%ifarch x86_64 aarch64 +%ifarch x86_64 aarch64 riscv64 %global llvm llvm-toolset-18-llvm %global llvm_root /opt/openEuler/llvm-toolset-18/root%{_prefix} %global clang_maj_ver 18 @@ -143,7 +143,7 @@ BuildRequires: %{llvm}-static libffi-devel %endif BuildRequires: procps-ng BuildRequires: ninja-build -%ifarch x86_64 aarch64 +%ifarch x86_64 aarch64 riscv64 BuildRequires: llvm-toolset-18-compiler-rt BuildRequires: llvm-toolset-18-clang %else @@ -391,7 +391,7 @@ test -r "%{profiler}" --enable-verbose-tests \ %{?codegen_units_std} \ --release-channel=stable -%ifarch loongarch64 riscv64 +%ifarch loongarch64 %{python} ./x.py build -j "$((($ncpus + 3) / 4))" --stage 2 %else %{python} ./x.py build -j "$ncpus" --stage 2 @@ -564,6 +564,9 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Wed Feb 26 2025 laokz - 1.82.0-10 +- Switch to unbundled llvm for riscv64 building + * Wed Jan 15 2025 wangkai <13474090681@163.com> - 1.82.0-9 - Switch to unbundled llvm for x86_64 aarch64 building