packages: rpm-build-macros/rpm.macros - return 0.0 when __cc/__cxx exit wit...
glen
glen at pld-linux.org
Mon Dec 27 21:15:20 CET 2010
Author: glen Date: Mon Dec 27 20:15:20 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- return 0.0 when __cc/__cxx exit with failure
---- Files affected:
packages/rpm-build-macros:
rpm.macros (1.596 -> 1.597)
---- Diffs:
================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.596 packages/rpm-build-macros/rpm.macros:1.597
--- packages/rpm-build-macros/rpm.macros:1.596 Tue Dec 21 18:07:25 2010
+++ packages/rpm-build-macros/rpm.macros Mon Dec 27 21:15:15 2010
@@ -16,8 +16,8 @@
%kgcc_package gcc
# compiler version
-%cc_version %{expand:%%global cc_version %(%{__cc} -dumpversion || echo ERROR)}%cc_version
-%cxx_version %{expand:%%global cxx_version %(%{__cxx} -dumpversion || echo ERROR)}%cxx_version
+%cc_version %{expand:%%global cc_version %(%{__cc} -dumpversion 2>/dev/null || echo 0.0)}%cc_version
+%cxx_version %{expand:%%global cxx_version %(%{__cxx} -dumpversion 2>/dev/null || echo 0.0)}%cxx_version
%__rm /bin/rm --interactive=never
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.596&r2=1.597&f=u
More information about the pld-cvs-commit
mailing list