Hoist EFI_TARGET and SOURCE_DATE_EPOCH up into efi/Makefile.inc

This commit is contained in:
Warner Losh 2018-07-20 05:18:03 +00:00
parent fdcfd483e3
commit 1f9bd5f67c
3 changed files with 12 additions and 22 deletions

View File

@ -19,4 +19,16 @@ CFLAGS+= -fPIC
CFLAGS+= -fPIC CFLAGS+= -fPIC
.endif .endif
.if ${MACHINE_CPUARCH} == "amd64"
EFI_TARGET= efi-app-x86_64
.elif ${MACHINE_CPUARCH} == "i386"
EFI_TARGET= efi-app-ia32
.else
EFI_TARGET= binary
.endif
# Arbitrarily set the PE/COFF header timestamps to 1 Jan 2016 00:00:00
# for build reproducibility.
SOURCE_DATE_EPOCH?=1451606400
.include "../Makefile.inc" .include "../Makefile.inc"

View File

@ -76,17 +76,6 @@ LDADD+= ${LIBEFI} ${LIBSA}
DPADD+= ${LDSCRIPT} DPADD+= ${LDSCRIPT}
.if ${MACHINE_CPUARCH} == "amd64"
EFI_TARGET= efi-app-x86_64
.elif ${MACHINE_CPUARCH} == "i386"
EFI_TARGET= efi-app-ia32
.else
EFI_TARGET= binary
.endif
# Arbitrarily set the PE/COFF header timestamps to 1 Jan 2016 00:00:00
# for build reproducibility.
SOURCE_DATE_EPOCH?=1451606400
boot1.efi: ${PROG} boot1.efi: ${PROG}
if ${NM} ${.ALLSRC} | grep ' U '; then \ if ${NM} ${.ALLSRC} | grep ' U '; then \
echo "Undefined symbols in ${.ALLSRC}"; \ echo "Undefined symbols in ${.ALLSRC}"; \

View File

@ -91,17 +91,6 @@ CLEANFILES+= loader.efi
NEWVERSWHAT= "EFI loader" ${MACHINE} NEWVERSWHAT= "EFI loader" ${MACHINE}
.if ${MACHINE_CPUARCH} == "amd64"
EFI_TARGET= efi-app-x86_64
.elif ${MACHINE_CPUARCH} == "i386"
EFI_TARGET= efi-app-ia32
.else
EFI_TARGET= binary
.endif
# Arbitrarily set the PE/COFF header timestamps to 1 Jan 2016 00:00:00
# for build reproducibility.
SOURCE_DATE_EPOCH?=1451606400
loader.efi: ${PROG} loader.efi: ${PROG}
if ${NM} ${.ALLSRC} | grep ' U '; then \ if ${NM} ${.ALLSRC} | grep ' U '; then \
echo "Undefined symbols in ${.ALLSRC}"; \ echo "Undefined symbols in ${.ALLSRC}"; \