svn commit: r336535 - in head/stand/efi: . boot1 loader

[Warner Losh]

Author: imp
Date: Fri Jul 20 05:18:03 2018
New Revision: 336535
URL: https://svnweb.freebsd.org/changeset/base/336535

Log:
  Hoist EFI_TARGET and SOURCE_DATE_EPOCH up into efi/Makefile.inc

Modified:
  head/stand/efi/Makefile.inc
  head/stand/efi/boot1/Makefile
  head/stand/efi/loader/Makefile

Modified: head/stand/efi/Makefile.inc
==============================================================================
--- head/stand/efi/Makefile.inc	Fri Jul 20 05:17:56 2018	(r336534)
+++ head/stand/efi/Makefile.inc	Fri Jul 20 05:18:03 2018	(r336535)
@@ -19,4 +19,16 @@ CFLAGS+=	-fPIC
 CFLAGS+=	-fPIC
 .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"

Modified: head/stand/efi/boot1/Makefile
==============================================================================
--- head/stand/efi/boot1/Makefile	Fri Jul 20 05:17:56 2018	(r336534)
+++ head/stand/efi/boot1/Makefile	Fri Jul 20 05:18:03 2018	(r336535)
@@ -76,17 +76,6 @@ LDADD+=		${LIBEFI} ${LIBSA}
 
 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}
 	if ${NM} ${.ALLSRC} | grep ' U '; then \
 		echo "Undefined symbols in ${.ALLSRC}"; \

Modified: head/stand/efi/loader/Makefile
==============================================================================
--- head/stand/efi/loader/Makefile	Fri Jul 20 05:17:56 2018	(r336534)
+++ head/stand/efi/loader/Makefile	Fri Jul 20 05:18:03 2018	(r336535)
@@ -91,17 +91,6 @@ CLEANFILES+=	loader.efi
 
 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}
 	if ${NM} ${.ALLSRC} | grep ' U '; then \
 		echo "Undefined symbols in ${.ALLSRC}"; \