1.675: %cmake to respect env $CC and $CXX first

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 89cdd8280181655775f96c95fbf323fd091df828..9b4c8a09b0f36f66b3bfa76b89c76bd635c643f2 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -5,13 +5,13 @@
 %if "%{pld_release}" == "ac"
 %define        with_rpm4       1
 %endif
-%define                rpm_macros_rev  1.674
+%define                rpm_macros_rev  1.675
 %define                find_lang_rev   1.36
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
 Name:          rpm-build-macros
 Version:       %{rpm_macros_rev}
-Release:       2
+Release:       1
 License:       GPL
 Group:         Development/Building
 Source0:       rpm.macros

diff --git a/rpm.macros b/rpm.macros
index f4fd66b7a8577582c9702d4289d3a8089f3f48e3..73e83c2c19c2ca1c68e6405d1ddc72a02fa09d29 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -243,8 +243,8 @@
 }
 
 %cmake \
-%{?__cc:CC="%{__cc}"} \\\
-%{?__cxx:CXX="%{__cxx}"} \\\
+%{?__cc:CC="${CC:-%{__cc}}"} \\\
+%{?__cxx:CXX="${CXX:-%{__cxx}}"} \\\
 CPPFLAGS="${CPPFLAGS:-%{rpmcppflags}}" \\\
 %{__cmake} \\\
        -DCMAKE_VERBOSE_MAKEFILE=ON \\\