handle new %rustc_wrapper macro; rel 2

if set runs cargo with RUSTC_WRAPPER env var

diff --git a/macros.rust b/macros.rust
index aa1f7abd486951bc91be99c411bcaa0c50bc7c5f..51f8fe46b51b2555aabe31aaee31ed2533943065 100644 (file)
--- a/macros.rust
+++ b/macros.rust
@@ -42,6 +42,7 @@ thumbv7neon-unknown-linux-gnueabihf\\\
        CXXFLAGS="%{rpmcppflags} %{rpmcxxflags}" \\\
        LDFLAGS="%{rpmldflags}" \\\
        PKG_CONFIG_ALLOW_CROSS=1 \\\
+       %{?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} \\\

diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index b6c13d18fbfc98a659bf3d0033658d46a77ff688..77ac1260285fdee11f8f6976c595ee6a45678225 100644 (file)
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -6,7 +6,7 @@ Summary:        PLD Linux RPM macros
 Summary(pl.UTF-8):     Makra RPM dla Linuksa PLD
 Name:          rpm-pld-macros
 Version:       %{rpm_macros_rev}
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         Development/Building
 Source0:       macros.pld