Re: [PATCH] bios: fix for parallel build (make -j2)

Re: [PATCH] bios: fix for parallel build (make -j2)

[Avi Kivity]

Carlo Marcelo Arenas Belon wrote:
> prevents reusing tmp.bin for both BIOS-bochs-legacy and BIOS-bochs-latest
> targets.
>
> committed upstream in revision 1.27 of Makefile.in to fix bug 1799877.
> patch applied as well to generated Makefile.
>
>   

Applied, thanks.

-- 
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

[PATCH] bios: fix for parallel build (make -j2)

[Carlo Marcelo Arenas Belon]

prevents reusing tmp.bin for both BIOS-bochs-legacy and BIOS-bochs-latest
targets.

committed upstream in revision 1.27 of Makefile.in to fix bug 1799877.
patch applied as well to generated Makefile.

Signed-off-by: Carlo Marcelo Arenas Belon <carenas-kLeDWSohozoJb6fo7hG9ng@public.gmane.org>
---
 bios/Makefile    |    4 ++--
 bios/Makefile.in |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bios/Makefile b/bios/Makefile
index 0abc108..36e6248 100644
--- a/bios/Makefile
+++ b/bios/Makefile
@@ -75,9 +75,9 @@ BIOS-bochs-legacy: rombios.c apmbios.S biossums rombios.h
 	$(GCC) $(BIOS_BUILD_DATE) -DLEGACY -E -P $< > _rombiosl_.c
 	$(BCC) -o rombiosl.s -C-c -D__i86__ -0 -S _rombiosl_.c
 	sed -e 's/^\.text//' -e 's/^\.data//' rombiosl.s > _rombiosl_.s
-	$(AS86) _rombiosl_.s -b tmp.bin -u- -w- -g -0 -j -O -l rombiosl.txt
+	$(AS86) _rombiosl_.s -b tmpl.bin -u- -w- -g -0 -j -O -l rombiosl.txt
 	-perl ${srcdir}/makesym.perl < rombiosl.txt > rombiosl.sym
-	mv tmp.bin $@
+	mv tmpl.bin $@
 	./biossums $@
 	rm -f  _rombiosl_.s
 
diff --git a/bios/Makefile.in b/bios/Makefile.in
index 3e332ae..9b153d3 100644
--- a/bios/Makefile.in
+++ b/bios/Makefile.in
@@ -74,9 +74,9 @@ BIOS-bochs-legacy: rombios.c apmbios.S biossums rombios.h
 	$(GCC) $(BIOS_BUILD_DATE) -DLEGACY -E -P $< > _rombiosl_.c
 	$(BCC) -o rombiosl.s -C-c -D__i86__ -0 -S _rombiosl_.c
 	sed -e 's/^\.text//' -e 's/^\.data//' rombiosl.s > _rombiosl_.s
-	$(AS86) _rombiosl_.s -b tmp.bin -u- -w- -g -0 -j -O -l rombiosl.txt
+	$(AS86) _rombiosl_.s -b tmpl.bin -u- -w- -g -0 -j -O -l rombiosl.txt
 	-perl ${srcdir}/makesym.perl < rombiosl.txt > rombiosl.sym
-	mv tmp.bin $@
+	mv tmpl.bin $@
 	./biossums $@
 	@RMCOMMAND@ _rombiosl_.s
 
-- 
1.5.3.7


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/