[packages/rpm] - define the right compiler for x32

baggins baggins at pld-linux.org
Sun Jan 25 11:19:03 CET 2015


commit 866e45c8382ee61f346bc33f5a4a53148189e19a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Jan 25 09:34:50 2015 +0000

    - define the right compiler for x32

 rpm.spec | 7 +++++++
 1 file changed, 7 insertions(+)
---
diff --git a/rpm.spec b/rpm.spec
index b764e3e..6277e5a 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -374,9 +374,16 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		x8664	amd64 ia32e x86_64
 
 # stabilize new build environment
+%ifnarch x32
 %define		__newcc %{?force_cc}%{!?force_cc:%{_target_cpu}-pld-linux-gcc}
 %define		__newcxx %{?force_cxx}%{!?force_cxx:%{_target_cpu}-pld-linux-g++}
 %define		__newcpp %{?force_cpp}%{!?force_cpp:%{_target_cpu}-pld-linux-gcc -E}
+%else
+# x32 is a very special case
+%define		__newcc %{?force_cc}%{!?force_cc:x86_64-pld-linux-gnux32-gcc}
+%define		__newcxx %{?force_cxx}%{!?force_cxx:x86_64-pld-linux-gnux32-g++}
+%define		__newcpp %{?force_cpp}%{!?force_cpp:x86_64-pld-linux-gnux32-gcc -E}
+%endif
 
 %define		_rpmlibdir /usr/lib/rpm
 %define		_noautocompressdoc	RPM-GPG-KEY
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/eb5300f2d1c5002e57b51de5924b9a21e615b8b3



More information about the pld-cvs-commit mailing list