From 719b49879d68cc0b7e4e96e770cfd925ff65c463 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 24 Jun 2010 17:20:35 +0100 Subject: [build] Fix broken build caused by implied dependency upon "perl" Commit ea12dc0 ("[build] Avoid hard-coding the path to perl") introduced a build failure for fully clean trees (e.g. after running "make veryclean"), since the dependency upon $(PARSEROM) now includes a dependency upon "perl" (which doesn't exist) rather than upon "/usr/bin/perl" (which does exist). There should of course be no dependency upon the perl binary at all; the dependency should be upon "./util/parserom.pl" alone. Fix by removing the $(PERL) from the definition of Perl-based utility paths, and adding $(PERL) at the point of usage. Reported-by: Stefan Hajnoczi Signed-off-by: Michael Brown --- src/arch/i386/Makefile.pcbios | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/arch') diff --git a/src/arch/i386/Makefile.pcbios b/src/arch/i386/Makefile.pcbios index 1c1b5a88e..1a9cc1309 100644 --- a/src/arch/i386/Makefile.pcbios +++ b/src/arch/i386/Makefile.pcbios @@ -23,14 +23,14 @@ MEDIA += raw # Padding rules # -PAD_rom = $(PADIMG) --blksize=512 --byte=0xff $@ +PAD_rom = $(PERL) $(PADIMG) --blksize=512 --byte=0xff $@ PAD_mrom = $(PAD_rom) -PAD_dsk = $(PADIMG) --blksize=512 $@ -PAD_hd = $(PADIMG) --blksize=32768 $@ +PAD_dsk = $(PERL) $(PADIMG) --blksize=512 $@ +PAD_hd = $(PERL) $(PADIMG) --blksize=32768 $@ # Finalisation rules # -FINALISE_rom = $(FIXROM) $@ +FINALISE_rom = $(PERL) $(FIXROM) $@ FINALISE_mrom = $(FINALISE_rom) # rule to make a non-emulation ISO boot image -- cgit v1.2.3-55-g7522