[packages/rust] use %rust_host_triple for packaging host tools

atler atler at pld-linux.org
Wed Sep 25 17:11:54 CEST 2024


commit 881ab6dca5a8e1c04bc1185fc7c48c4f84a40536
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Sep 25 17:08:28 2024 +0200

    use %rust_host_triple for packaging host tools
    
    tier 2 platforms won't have host tools so don't use %rust_triple

 rust.spec | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/rust.spec b/rust.spec
index be4879b..5482876 100644
--- a/rust.spec
+++ b/rust.spec
@@ -502,13 +502,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/rustc.1*
 %{_mandir}/man1/rustdoc.1*
 %dir %{rustlibdir}
-%dir %{rustlibdir}/%rust_triple/bin
-%attr(755,root,root) %{rustlibdir}/%rust_triple/bin/rust-lld
-%dir %{rustlibdir}/%rust_triple/bin/gcc-ld
-%attr(755,root,root) %{rustlibdir}/%rust_triple/bin/gcc-ld/ld.lld
-%attr(755,root,root) %{rustlibdir}/%rust_triple/bin/gcc-ld/ld64.lld
-%attr(755,root,root) %{rustlibdir}/%rust_triple/bin/gcc-ld/lld-link
-%attr(755,root,root) %{rustlibdir}/%rust_triple/bin/gcc-ld/wasm-ld
+%if "%rust_triple" != "%rust_host_triple"
+%dir %{rustlibdir}/%rust_host_triple
+%endif
+%dir %{rustlibdir}/%rust_host_triple/bin
+%attr(755,root,root) %{rustlibdir}/%rust_host_triple/bin/rust-lld
+%dir %{rustlibdir}/%rust_host_triple/bin/gcc-ld
+%attr(755,root,root) %{rustlibdir}/%rust_host_triple/bin/gcc-ld/ld.lld
+%attr(755,root,root) %{rustlibdir}/%rust_host_triple/bin/gcc-ld/ld64.lld
+%attr(755,root,root) %{rustlibdir}/%rust_host_triple/bin/gcc-ld/lld-link
+%attr(755,root,root) %{rustlibdir}/%rust_host_triple/bin/gcc-ld/wasm-ld
 
 %files std
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rust.git/commitdiff/881ab6dca5a8e1c04bc1185fc7c48c4f84a40536



More information about the pld-cvs-commit mailing list