Enable rust-analyzer for riscv64

This is a test. Might not work. Testing to provide feedback on GitHub:

https://github.com/rust-lang/rust/pull/75103

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2023-01-11 16:35:44 +00:00
parent 77bce84d63
commit 96dc0c89e7
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
2 changed files with 26 additions and 4 deletions

16
enable-ra-for-riscv.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 12585e80e..f7b882880 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -1085,11 +1085,6 @@ impl Step for RustAnalyzer {
fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
let compiler = self.compiler;
let target = self.target;
-
- if target.contains("riscv64") {
- // riscv64 currently has an LLVM bug that makes rust-analyzer unable
- // to build. See #74813 for details.
- return None;
}
let rust_analyzer = builder

View File

@ -88,7 +88,7 @@
Name: rust
Version: 1.66.0
Release: 1.0.riscv64%{?dist}
Release: 1.1.riscv64%{?dist}
Summary: The Rust Programming Language
License: (ASL 2.0 or MIT) and (BSD and MIT)
# ^ written as: (rust itself) and (bundled libraries)
@ -135,6 +135,9 @@ Patch101: rustc-1.65.0-disable-http2.patch
# (affects RHEL6 kernels when building for RHEL7)
Patch102: rustc-1.65.0-no-default-pie.patch
# Enable rust-analyzer on riscv64
Patch103: enable-ra-for-riscv.patch
# Get the Rust triple for any arch.
%{lua: function rust_triple(arch)
@ -610,6 +613,8 @@ rm -rf vendor/libnghttp2-sys/
%patch102 -p1
%endif
%patch103 -p1
# Use our explicit python3 first
sed -i.try-python -e '/^try python3 /i try "%{__python3}" "$@"' ./configure
@ -1032,9 +1037,7 @@ end}
%files analyzer
%{_bindir}/rls
%ifnarch riscv64
%{_bindir}/rust-analyzer
%endif
%doc src/tools/rust-analyzer/README.md
%license src/tools/rust-analyzer/LICENSE-{APACHE,MIT}
@ -1062,7 +1065,10 @@ end}
%changelog
* Tue Jan 10 2022 David Abdurachmanov <davidlt@rivosinc.com> - 1.66.0-1.0.riscv64
* Wed Jan 11 2022 David Abdurachmanov <davidlt@rivosinc.com> - 1.66.0-1.1.riscv64
- Enable riscv-analyzer for riscv64
* Tue Jan 09 2022 David Abdurachmanov <davidlt@rivosinc.com> - 1.66.0-1.0.riscv64
- Do not package rust-analyzer on riscv64
- Enable riscv64