diff options
| author | jhb <jhb@FreeBSD.org> | 2015-09-17 18:32:51 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2015-09-17 18:32:51 +0000 |
| commit | 616c9695174da287ca6edff1717a43bc778266c2 (patch) | |
| tree | 9b979f0d9eb4a3f245edcf3e4f830e9786263466 /sys/boot | |
| parent | 45de05604807779a942c9ec68c311a48ced3fe8c (diff) | |
| download | FreeBSD-src-616c9695174da287ca6edff1717a43bc778266c2.zip FreeBSD-src-616c9695174da287ca6edff1717a43bc778266c2.tar.gz | |
Various small cleanups to EFI loader Makefiles.
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D3641
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/efi/boot1/Makefile | 10 | ||||
| -rw-r--r-- | sys/boot/efi/loader/Makefile | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sys/boot/efi/boot1/Makefile b/sys/boot/efi/boot1/Makefile index c6a6d59..c1b3714 100644 --- a/sys/boot/efi/boot1/Makefile +++ b/sys/boot/efi/boot1/Makefile @@ -9,7 +9,7 @@ MAN= MK_SSP= no -PROG= loader.sym +PROG= boot1.sym INTERNALPROG= # architecture-specific loader code @@ -50,7 +50,7 @@ DPADD+= ${LIBSTAND} LDADD+= -lstand .endif -${PROG}: ${LDSCRIPT} +DPADD+= ${LDSCRIPT} OBJCOPY?= objcopy OBJDUMP?= objdump @@ -63,19 +63,19 @@ EFI_TARGET= efi-app-ia32 EFI_TARGET= binary .endif -boot1.efi: loader.sym +boot1.efi: ${PROG} if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \ ${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \ exit 1; \ fi ${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \ -j .dynamic -j .dynsym -j .rel.dyn \ - -j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \ + -j .rela.dyn -j .reloc -j .eh_frame \ --output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET} boot1.o: ${.CURDIR}/../../common/ufsread.c -# The following inserts out objects into a template FAT file system +# The following inserts our objects into a template FAT file system # created by generate-fat.sh .include "${.CURDIR}/Makefile.fat" diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile index b341704..c607f46 100644 --- a/sys/boot/efi/loader/Makefile +++ b/sys/boot/efi/loader/Makefile @@ -12,7 +12,6 @@ MK_SSP= no PROG= loader.sym INTERNALPROG= -.PATH: ${.CURDIR}/../../efi/loader # architecture-specific loader code SRCS= autoload.c \ bootinfo.c \ @@ -97,7 +96,7 @@ EFI_TARGET= efi-app-ia32 EFI_TARGET= binary .endif -loader.efi: loader.sym +loader.efi: ${PROG} if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \ ${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \ exit 1; \ |
