fantonifabio@tiscali.it
2013-Feb-18 13:24 UTC
[PATCH] tools/firmware: Fix ovmf build with gcc version different from 4.4
From: Fabio Fantoni <fabio.fantoni@heliman.it> Signed-off-by: Fabio Fantoni <fabio.fantoni@heliman.it> --- 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 .PHONY: clean clean: -- 1.7.9.5
Keir Fraser
2013-Feb-18 14:17 UTC
Re: [PATCH] tools/firmware: Fix ovmf build with gcc version different from 4.4
On 18/02/2013 13:24, "fantonifabio@tiscali.it" <fantonifabio@tiscali.it> wrote:> From: Fabio Fantoni <fabio.fantoni@heliman.it> > > Signed-off-by: Fabio Fantoni <fabio.fantoni@heliman.it>They have a separate config for every version of gcc? That''s mad. :) -- Keir> --- > 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 > > .PHONY: clean > clean:
Ian Campbell
2013-Mar-12 15:32 UTC
Re: [PATCH] tools/firmware: Fix ovmf build with gcc version different from 4.4
On Mon, 2013-02-18 at 13:24 +0000, fantonifabio@tiscali.it wrote:> From: Fabio Fantoni <fabio.fantoni@heliman.it> > > Signed-off-by: Fabio Fantoni <fabio.fantoni@heliman.it> > --- > 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.binDoes "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.