From 54c0773f2c64bf9f207943ad9f318ceff91eace0 Mon Sep 17 00:00:00 2001 From: laokz Date: Mon, 17 Feb 2025 05:29:06 +0000 Subject: [PATCH] riscv64: switch to system llvm-toolset-18 (cherry picked from commit bdc7eb368ffd0c28edf2759dc4318c0148f8e328) --- rust.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/rust.spec b/rust.spec index 02eba95..3b3a524 100644 --- a/rust.spec +++ b/rust.spec @@ -5,7 +5,7 @@ %global bootstrap_date 2024-11-28 %global bootstrap_arches x86_64 aarch64 riscv64 loongarch64 %bcond_with llvm_static -%ifarch x86_64 aarch64 +%ifarch x86_64 aarch64 riscv64 %bcond_with bundled_llvm %else %bcond_without bundled_llvm @@ -27,7 +27,7 @@ Name: rust Version: 1.84.0 -Release: 2 +Release: 3 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 %if %defined llvm %global llvm_root %{_libdir}/%{llvm} %else -%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 @@ -559,6 +559,9 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Fri Feb 21 2025 laokz - 1.84.0-3 +- Switch to unbundled llvm for riscv64 building + * Mon Feb 17 2025 wangkai <13474090681@163.com> - 1.84.0-2 - Switch to unbundled llvm for x86_64 aarch64 building -- Gitee