svn commit: r336534 - in head/stand: efi/boot1 efi/loader i386/boot2 i386/gptboot i386/gptzfsboot i386/isoboot i386/zfsboot

[Warner Losh]

Author: imp
Date: Fri Jul 20 05:17:56 2018
New Revision: 336534
URL: https://svnweb.freebsd.org/changeset/base/336534

Log:
  NM and OBJCOPY are already defined for all builds. There's no need to
  conditionally define them here.

Modified:
  head/stand/efi/boot1/Makefile
  head/stand/efi/loader/Makefile
  head/stand/i386/boot2/Makefile
  head/stand/i386/gptboot/Makefile
  head/stand/i386/gptzfsboot/Makefile
  head/stand/i386/isoboot/Makefile
  head/stand/i386/zfsboot/Makefile

Modified: head/stand/efi/boot1/Makefile
==============================================================================
--- head/stand/efi/boot1/Makefile	Fri Jul 20 05:17:49 2018	(r336533)
+++ head/stand/efi/boot1/Makefile	Fri Jul 20 05:17:56 2018	(r336534)
@@ -76,9 +76,6 @@ LDADD+=		${LIBEFI} ${LIBSA}
 
 DPADD+=		${LDSCRIPT}
 
-NM?=		nm
-OBJCOPY?=	objcopy
-
 .if ${MACHINE_CPUARCH} == "amd64"
 EFI_TARGET=	efi-app-x86_64
 .elif ${MACHINE_CPUARCH} == "i386"

Modified: head/stand/efi/loader/Makefile
==============================================================================
--- head/stand/efi/loader/Makefile	Fri Jul 20 05:17:49 2018	(r336533)
+++ head/stand/efi/loader/Makefile	Fri Jul 20 05:17:56 2018	(r336534)
@@ -91,9 +91,6 @@ CLEANFILES+=	loader.efi
 
 NEWVERSWHAT=	"EFI loader" ${MACHINE}
 
-NM?=		nm
-OBJCOPY?=	objcopy
-
 .if ${MACHINE_CPUARCH} == "amd64"
 EFI_TARGET=	efi-app-x86_64
 .elif ${MACHINE_CPUARCH} == "i386"

Modified: head/stand/i386/boot2/Makefile
==============================================================================
--- head/stand/i386/boot2/Makefile	Fri Jul 20 05:17:49 2018	(r336533)
+++ head/stand/i386/boot2/Makefile	Fri Jul 20 05:17:56 2018	(r336534)
@@ -4,8 +4,6 @@
 
 FILES=		boot boot1 boot2
 
-NM?=		nm
-
 # A value of 0x80 enables LBA support.
 BOOT_BOOT1_FLAGS?=	0x80
 

Modified: head/stand/i386/gptboot/Makefile
==============================================================================
--- head/stand/i386/gptboot/Makefile	Fri Jul 20 05:17:49 2018	(r336533)
+++ head/stand/i386/gptboot/Makefile	Fri Jul 20 05:17:56 2018	(r336534)
@@ -7,8 +7,6 @@
 FILES=		gptboot
 MAN=		gptboot.8
 
-NM?=		nm
-
 BOOT_COMCONSOLE_PORT?= 0x3f8
 BOOT_COMCONSOLE_SPEED?= 9600
 B2SIOFMT?=	0x3

Modified: head/stand/i386/gptzfsboot/Makefile
==============================================================================
--- head/stand/i386/gptzfsboot/Makefile	Fri Jul 20 05:17:49 2018	(r336533)
+++ head/stand/i386/gptzfsboot/Makefile	Fri Jul 20 05:17:56 2018	(r336534)
@@ -9,8 +9,6 @@
 FILES=		gptzfsboot
 MAN=		gptzfsboot.8
 
-NM?=		nm
-
 BOOT_COMCONSOLE_PORT?= 0x3f8
 BOOT_COMCONSOLE_SPEED?= 9600
 B2SIOFMT?=	0x3

Modified: head/stand/i386/isoboot/Makefile
==============================================================================
--- head/stand/i386/isoboot/Makefile	Fri Jul 20 05:17:49 2018	(r336533)
+++ head/stand/i386/isoboot/Makefile	Fri Jul 20 05:17:56 2018	(r336534)
@@ -8,8 +8,6 @@
 FILES=		isoboot
 MAN=		isoboot.8
 
-NM?=		nm
-
 BOOT_COMCONSOLE_PORT?= 0x3f8
 BOOT_COMCONSOLE_SPEED?= 9600
 B2SIOFMT?=	0x3

Modified: head/stand/i386/zfsboot/Makefile
==============================================================================
--- head/stand/i386/zfsboot/Makefile	Fri Jul 20 05:17:49 2018	(r336533)
+++ head/stand/i386/zfsboot/Makefile	Fri Jul 20 05:17:56 2018	(r336534)
@@ -7,8 +7,6 @@
 FILES=		zfsboot
 MAN=		zfsboot.8
 
-NM?=		nm
-
 BOOT_COMCONSOLE_PORT?= 0x3f8
 BOOT_COMCONSOLE_SPEED?= 9600
 B2SIOFMT?=	0x3