summaryrefslogtreecommitdiffstats
path: root/src/arch/i386
diff options
context:
space:
mode:
authorMichael Brown2010-06-24 18:20:35 +0200
committerMichael Brown2010-06-24 18:25:54 +0200
commit719b49879d68cc0b7e4e96e770cfd925ff65c463 (patch)
tree9687c7140fa51a210d95d785566fc46d28c1a5e0 /src/arch/i386
parent[build] Avoid hard-coding the path to perl (diff)
downloadipxe-719b49879d68cc0b7e4e96e770cfd925ff65c463.tar.gz
ipxe-719b49879d68cc0b7e4e96e770cfd925ff65c463.tar.xz
ipxe-719b49879d68cc0b7e4e96e770cfd925ff65c463.zip
[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 <stefanha@gmail.com> Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/i386')
-rw-r--r--src/arch/i386/Makefile.pcbios8
1 files changed, 4 insertions, 4 deletions
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