- merged 2.030 from PLD, re-enabled PHP dependency generators

[packages/rpm-tld-macros.git] / macros.rust

diff --git a/macros.rust b/macros.rust
index 51f8fe46b51b2555aabe31aaee31ed2533943065..7996c4fa934a030f9f550cd4bbd4443524b17082 100644 (file)
--- a/macros.rust
+++ b/macros.rust
@@ -33,6 +33,7 @@ thumbv7neon-unknown-linux-gnueabihf\\\
 %cargo_targetdir       target
 %cargo_objdir          %{?buildsubdir:%{_builddir}/%{buildsubdir}/}%{cargo_targetdir}/%{rust_target}/%{!?debug:release}%{?debug:debug}
 
+%__rustc       /usr/bin/rustc
 %__cargo       /usr/bin/cargo
 %__cargo_common_opts   -v --offline
 %cargo_build \\\
@@ -42,11 +43,12 @@ thumbv7neon-unknown-linux-gnueabihf\\\
        CXXFLAGS="%{rpmcppflags} %{rpmcxxflags}" \\\
        LDFLAGS="%{rpmldflags}" \\\
        PKG_CONFIG_ALLOW_CROSS=1 \\\
+       RUSTC="${RUSTC:-%__rustc}" \\\
        %{?rustc_wrapper:RUSTC_WRAPPER="${RUSTC_WRAPPER:-%rustc_wrapper}"} \\\
        RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" \\\
        %{?__jobs:CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-%{__jobs}}"} \\\
        %{__cargo} %{__cargo_common_opts} build %{!?debug:--release} \\\
-       --target %{rust_target} \\\
+       --target %rust_target \\\
        --target-dir %{cargo_targetdir} \\\
 %{nil}
 
@@ -57,9 +59,11 @@ thumbv7neon-unknown-linux-gnueabihf\\\
        CXXFLAGS="%{rpmcppflags} %{rpmcxxflags}" \\\
        LDFLAGS="%{rpmldflags}" \\\
        PKG_CONFIG_ALLOW_CROSS=1 \\\
+       RUSTC="${RUSTC:-%__rustc}" \\\
+       %{?rustc_wrapper:RUSTC_WRAPPER="${RUSTC_WRAPPER:-%rustc_wrapper}"} \\\
        RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" \\\
        %{?__jobs:CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-%{__jobs}}"} \\\
        %{__cargo} %{__cargo_common_opts} install \\\
-       --target %{rust_target} \\\
+       --target %rust_target \\\
        --target-dir %{cargo_targetdir} \\\
 %{nil}