From: H. Peter Anvin <hpa@zytor.com>
Date: Mon, 29 Jan 2007 00:49:07 +0000 (-0800)
Subject: Apparently rpmbuild won't accept a macro named "cc" either.  Morons.
X-Git-Tag: syslinux-3.35~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f7382b2e789b30992f935c471ef154b63cf5b83;p=profile%2Fivi%2Fsyslinux.git

Apparently rpmbuild won't accept a macro named "cc" either.  Morons.
---

diff --git a/syslinux.spec.in b/syslinux.spec.in
index 0559c00..115a6f2 100644
--- a/syslinux.spec.in
+++ b/syslinux.spec.in
@@ -15,10 +15,10 @@ BuildPrereq: nasm >= 0.98.38, perl
 Autoreq: 0
 %ifarch x86_64
 Requires: mtools, libc.so.6()(64bit)
-%define cc gcc
+%define my_cc gcc
 %else
 Requires: mtools, libc.so.6
-%define cc gcc -m32
+%define my_cc gcc -m32
 %endif
 
 # NOTE: extlinux belongs in /sbin, not in /usr/sbin, since it is typically
@@ -63,9 +63,9 @@ booting in the /tftpboot directory.
 %setup -q -n syslinux-%{VERSION}
 
 %build
-make CC='%{cc}' clean
-make CC='%{cc}' installer
-make CC='%{cc}' -C sample tidy
+make CC='%{my_cc}' clean
+make CC='%{my_cc}' installer
+make CC='%{my_cc}' -C sample tidy
 
 %install
 rm -rf %{buildroot}
@@ -74,10 +74,10 @@ mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_datadir}/syslinux
 mkdir -p %{buildroot}%{_includedir}
 mkdir -p %{buildroot}/boot %{buildroot}/tftpboot/pxelinux.cfg
-make CC='%{cc}' install-all \
+make CC='%{my_cc}' install-all \
 	INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_sbindir} \
 	LIBDIR=%{_datadir} INCDIR=%{_includedir}
-make CC='%{cc}' -C sample tidy
+make CC='%{my_cc}' -C sample tidy
 cp mkdiskimage sys2ansi.pl keytab-lilo.pl %{buildroot}%{_datadir}/syslinux
 cp %{buildroot}%{_datadir}/syslinux/*.c32	%{buildroot}/boot
 cp %{buildroot}%{_datadir}/syslinux/memdisk	%{buildroot}/boot