]> git.pld-linux.org Git - packages/rpm-pld-macros.git/commitdiff
use %rust_target instead of %cargo_targtet
authorJan Palus <atler@pld-linux.org>
Tue, 1 Mar 2022 20:40:22 +0000 (21:40 +0100)
committerJan Palus <atler@pld-linux.org>
Tue, 1 Mar 2022 20:40:22 +0000 (21:40 +0100)
macros.rust

index af49354be3b5d40a76ac5b89401141fba32fa04d..9ad61a05212520a09c04a6282d1e8f32bf48867b 100644 (file)
@@ -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}
This page took 0.401726 seconds and 4 git commands to generate.