From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH] tools/firmware: Fix ovmf build with gcc version different from 4.4 Date: Tue, 12 Mar 2013 15:32:47 +0000 Message-ID: <1363102367.32410.10.camel@zakaz.uk.xensource.com> References: <1361193850-5028-1-git-send-email-fantonifabio@tiscali.it> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1361193850-5028-1-git-send-email-fantonifabio@tiscali.it> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: "fantonifabio@tiscali.it" Cc: "xen-devel@lists.xensource.com" , Fabio Fantoni , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org On Mon, 2013-02-18 at 13:24 +0000, fantonifabio@tiscali.it wrote: > From: Fabio Fantoni > > Signed-off-by: Fabio Fantoni > --- > tools/firmware/ovmf-makefile | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile > index c3cd466..72fe99d 100644 > --- a/tools/firmware/ovmf-makefile > +++ b/tools/firmware/ovmf-makefile > @@ -1,6 +1,8 @@ > # OVMF building system is not ready yet to run in parallel. > # Force it to be serial in order to exploit parallelism for neighbors. > > +GCCVERSION = $(shell gcc --version | grep -om1 '[0-9]\+[.][0-9]\+' | tr -d . | tail -n1) > + > .NOTPARALLEL: > MAKEFLAGS += -j1 > > @@ -10,7 +12,7 @@ all: ovmf.bin > .PHONY: ovmf.bin > ovmf.bin: > OvmfPkg/build.sh -a X64 > - cp Build/OvmfX64/DEBUG_GCC44/FV/OVMF.fd ovmf.bin > + cp Build/OvmfX64/DEBUG_GCC$(GCCVERSION)/FV/OVMF.fd ovmf.bin Does "cp Build/OvmfX64/DEBUG_GCC??/FV/OVMF.fd ovmf.bin" work instead? (or perhaps * instead of ??). This avoids needing to parse gcc --version output, which is likely going to be fragile. Ian.