Author: kevans
Date: Thu Mar 1 21:46:01 2018
New Revision: 330250
URL: https://svnweb.freebsd.org/changeset/base/330250
Log:
stand: Fix build after r330249
One does not simply convert to SUBDIR.yes in stand without making everything
else in the affected files SUBDIR.yes -- there are better ways to do this.
Modified:
head/stand/efi/Makefile
head/stand/i386/Makefile
head/stand/powerpc/Makefile
head/stand/sparc64/Makefile
head/stand/uboot/Makefile
Modified: head/stand/efi/Makefile
==============================================================================
--- head/stand/efi/Makefile Thu Mar 1 19:59:49 2018 (r330249)
+++ head/stand/efi/Makefile Thu Mar 1 21:46:01 2018 (r330250)
@@ -9,7 +9,7 @@ NO_OBJ=t
.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500
SUBDIR.${MK_FDT}+= fdt
-SUBDIR+= libefi loader boot1
+SUBDIR.yes+= libefi loader boot1
.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500
Modified: head/stand/i386/Makefile
==============================================================================
--- head/stand/i386/Makefile Thu Mar 1 19:59:49 2018 (r330249)
+++ head/stand/i386/Makefile Thu Mar 1 21:46:01 2018 (r330250)
@@ -4,18 +4,18 @@ NO_OBJ=t
.include <bsd.init.mk>
-SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
+SUBDIR.yes= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
libi386
SUBDIR.${MK_LOADER_FIREWIRE}+= libfirewire
-SUBDIR+= loader
+SUBDIR.yes+= loader
# special boot programs, 'self-extracting boot2+loader'
-SUBDIR+= pxeldr
+SUBDIR.yes+= pxeldr
.if ${MACHINE_CPUARCH} == "i386"
-SUBDIR+= kgzldr
+SUBDIR.yes+= kgzldr
.endif
SUBDIR.${MK_ZFS}+= zfsboot gptzfsboot zfsloader
Modified: head/stand/powerpc/Makefile
==============================================================================
--- head/stand/powerpc/Makefile Thu Mar 1 19:59:49 2018 (r330249)
+++ head/stand/powerpc/Makefile Thu Mar 1 21:46:01 2018 (r330250)
@@ -4,7 +4,7 @@ NO_OBJ=t
.include <bsd.init.mk>
-SUBDIR= boot1.chrp ofw uboot
+SUBDIR.yes= boot1.chrp ofw uboot
SUBDIR.${MK_FDT}+= kboot
.include <bsd.subdir.mk>
Modified: head/stand/sparc64/Makefile
==============================================================================
--- head/stand/sparc64/Makefile Thu Mar 1 19:59:49 2018 (r330249)
+++ head/stand/sparc64/Makefile Thu Mar 1 21:46:01 2018 (r330250)
@@ -4,7 +4,7 @@ NO_OBJ=t
.include <bsd.init.mk>
-SUBDIR= boot1 loader
+SUBDIR.yes= boot1 loader
SUBDIR.${MK_ZFS}+=zfsboot zfsloader
.include <bsd.subdir.mk>
Modified: head/stand/uboot/Makefile
==============================================================================
--- head/stand/uboot/Makefile Thu Mar 1 19:59:49 2018 (r330249)
+++ head/stand/uboot/Makefile Thu Mar 1 21:46:01 2018 (r330250)
@@ -2,7 +2,7 @@
.include <bsd.init.mk>
-SUBDIR= lib
+SUBDIR.yes= lib
SUBDIR.${MK_FDT}+=fdt
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
