set CC/CXX in %cargo_{build,install}; rel 2

diff --git a/macros.rust b/macros.rust
index e439f12c13a1f59834161094ec3c27531e7942e2..3478957804fce38641408fe75f7e10bc740d3169 100644 (file)
--- a/macros.rust
+++ b/macros.rust
@@ -32,6 +32,8 @@ armv7-unknown-linux-gnueabihf\\\
 %__cargo       /usr/bin/cargo
 %__cargo_common_opts   -v --offline
 %cargo_build \\\
+       CC="%{__cc}" \\\
+       CXX="%{__cxx}" \\\
        PKG_CONFIG_ALLOW_CROSS=1 \\\
        RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" \\\
        %{?__jobs:CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-%{__jobs}}"} \\\
@@ -41,6 +43,8 @@ armv7-unknown-linux-gnueabihf\\\
 %{nil}
 
 %cargo_install \\\
+       CC="%{__cc}" \\\
+       CXX="%{__cxx}" \\\
        PKG_CONFIG_ALLOW_CROSS=1 \\\
        RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" \\\
        %{?__jobs:CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-%{__jobs}}"} \\\

diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index f055a4e5b1c4cfd973d90bce1d00aa6af2766811..b8400f697f86f6ade01bfa2391a5498efcb41a1d 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