[packages/rpm-pld-macros] use %rust_target instead of %cargo_targtet
atler
atler at pld-linux.org
Tue Mar 1 21:41:32 CET 2022
commit 84b620fa52e394e2f304d8ecc44c91f37d90ae50
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Mar 1 21:40:22 2022 +0100
use %rust_target instead of %cargo_targtet
macros.rust | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/macros.rust b/macros.rust
index af49354..9ad61a0 100644
--- a/macros.rust
+++ b/macros.rust
@@ -31,7 +31,7 @@ thumbv7neon-unknown-linux-gnueabihf\\\
%cargo_target %rust_target
%cargo_targetdir target
-%cargo_objdir %{?buildsubdir:%{_builddir}/%{buildsubdir}/}%{cargo_targetdir}/%{cargo_target}/%{!?debug:release}%{?debug:debug}
+%cargo_objdir %{?buildsubdir:%{_builddir}/%{buildsubdir}/}%{cargo_targetdir}/%{rust_target}/%{!?debug:release}%{?debug:debug}
%__cargo /usr/bin/cargo
%__cargo_common_opts -v --offline
@@ -45,7 +45,7 @@ thumbv7neon-unknown-linux-gnueabihf\\\
RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" \\\
%{?__jobs:CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-%{__jobs}}"} \\\
%{__cargo} %{__cargo_common_opts} build %{!?debug:--release} \\\
- --target %{cargo_target} \\\
+ --target %{rust_target} \\\
--target-dir %{cargo_targetdir} \\\
%{nil}
@@ -59,6 +59,6 @@ thumbv7neon-unknown-linux-gnueabihf\\\
RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" \\\
%{?__jobs:CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-%{__jobs}}"} \\\
%{__cargo} %{__cargo_common_opts} install \\\
- --target %{cargo_target} \\\
+ --target %{rust_target} \\\
--target-dir %{cargo_targetdir} \\\
%{nil}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/84b620fa52e394e2f304d8ecc44c91f37d90ae50
More information about the pld-cvs-commit
mailing list