diff options
| author | Warner Losh <imp@FreeBSD.org> | 2018-07-20 05:17:56 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2018-07-20 05:17:56 +0000 |
| commit | fdcfd483e3c0e3f0c155840bdf056785a12cbdb7 (patch) | |
| tree | fb84b34fe0f8ff44323281021c3a77d6234e7d4d | |
| parent | 1a14a0bfb71d935583ca1a3f3ce7e3c6648c10f9 (diff) | |
NM and OBJCOPY are already defined for all builds. There's no need to
conditionally define them here.
Notes
Notes:
svn path=/head/; revision=336534
| -rw-r--r-- | stand/efi/boot1/Makefile | 3 | ||||
| -rw-r--r-- | stand/efi/loader/Makefile | 3 | ||||
| -rw-r--r-- | stand/i386/boot2/Makefile | 2 | ||||
| -rw-r--r-- | stand/i386/gptboot/Makefile | 2 | ||||
| -rw-r--r-- | stand/i386/gptzfsboot/Makefile | 2 | ||||
| -rw-r--r-- | stand/i386/isoboot/Makefile | 2 | ||||
| -rw-r--r-- | stand/i386/zfsboot/Makefile | 2 |
7 files changed, 0 insertions, 16 deletions
diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile index 992afd5fc1d2..d7cdeb45307b 100644 --- a/stand/efi/boot1/Makefile +++ b/stand/efi/boot1/Makefile @@ -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" diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index e890f743da5a..147c3929584a 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -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" diff --git a/stand/i386/boot2/Makefile b/stand/i386/boot2/Makefile index 53bfd9e478b2..ab8c6f022bd7 100644 --- a/stand/i386/boot2/Makefile +++ b/stand/i386/boot2/Makefile @@ -4,8 +4,6 @@ FILES= boot boot1 boot2 -NM?= nm - # A value of 0x80 enables LBA support. BOOT_BOOT1_FLAGS?= 0x80 diff --git a/stand/i386/gptboot/Makefile b/stand/i386/gptboot/Makefile index c608bc3737d7..242db06f47c1 100644 --- a/stand/i386/gptboot/Makefile +++ b/stand/i386/gptboot/Makefile @@ -7,8 +7,6 @@ FILES= gptboot MAN= gptboot.8 -NM?= nm - BOOT_COMCONSOLE_PORT?= 0x3f8 BOOT_COMCONSOLE_SPEED?= 9600 B2SIOFMT?= 0x3 diff --git a/stand/i386/gptzfsboot/Makefile b/stand/i386/gptzfsboot/Makefile index 9cc2bbae9753..768fd5ea2e4b 100644 --- a/stand/i386/gptzfsboot/Makefile +++ b/stand/i386/gptzfsboot/Makefile @@ -9,8 +9,6 @@ FILES= gptzfsboot MAN= gptzfsboot.8 -NM?= nm - BOOT_COMCONSOLE_PORT?= 0x3f8 BOOT_COMCONSOLE_SPEED?= 9600 B2SIOFMT?= 0x3 diff --git a/stand/i386/isoboot/Makefile b/stand/i386/isoboot/Makefile index 76cddd3be8f7..d202ce9afb7c 100644 --- a/stand/i386/isoboot/Makefile +++ b/stand/i386/isoboot/Makefile @@ -8,8 +8,6 @@ FILES= isoboot MAN= isoboot.8 -NM?= nm - BOOT_COMCONSOLE_PORT?= 0x3f8 BOOT_COMCONSOLE_SPEED?= 9600 B2SIOFMT?= 0x3 diff --git a/stand/i386/zfsboot/Makefile b/stand/i386/zfsboot/Makefile index 47ad398d886c..b3bd7893a0f6 100644 --- a/stand/i386/zfsboot/Makefile +++ b/stand/i386/zfsboot/Makefile @@ -7,8 +7,6 @@ FILES= zfsboot MAN= zfsboot.8 -NM?= nm - BOOT_COMCONSOLE_PORT?= 0x3f8 BOOT_COMCONSOLE_SPEED?= 9600 B2SIOFMT?= 0x3 |