svn commit: r330123 - in stable/11/stand: . arm efi i386 mips powerpc sparc64

[Kyle Evans]

Author: kevans
Date: Wed Feb 28 18:31:35 2018
New Revision: 330123
URL: https://svnweb.freebsd.org/changeset/base/330123

Log:
  MFC r330004: Add NO_OBJ to those directories that don't make anything.
  
  For directories that don't many anything, add NO_OBJ=t just before we
  include bsd.init.mk. This prevents them from creating an OBJ
  directory. In addition, prevent defs.mk from creating the machine
  related links in these cases. They aren't needed and break, at least
  on stable, the read-only src tree build.
  
  PR:		226074

Modified:
  stable/11/stand/Makefile.i386
  stable/11/stand/arm/Makefile
  stable/11/stand/defs.mk
  stable/11/stand/efi/Makefile
  stable/11/stand/i386/Makefile
  stable/11/stand/mips/Makefile
  stable/11/stand/powerpc/Makefile
  stable/11/stand/sparc64/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/stand/Makefile.i386
==============================================================================
--- stable/11/stand/Makefile.i386	Wed Feb 28 17:20:10 2018	(r330122)
+++ stable/11/stand/Makefile.i386	Wed Feb 28 18:31:35 2018	(r330123)
@@ -6,5 +6,3 @@ SUBDIR+=		geli
 .if ${MK_ZFS} != "no"
 SUBDIR+=		zfs
 .endif
-
-SUBDIR+=		efi

Modified: stable/11/stand/arm/Makefile
==============================================================================
--- stable/11/stand/arm/Makefile	Wed Feb 28 17:20:10 2018	(r330122)
+++ stable/11/stand/arm/Makefile	Wed Feb 28 18:31:35 2018	(r330123)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+NO_OBJ=t
+
 SUBDIR=		uboot
 
 .include <bsd.subdir.mk>

Modified: stable/11/stand/defs.mk
==============================================================================
--- stable/11/stand/defs.mk	Wed Feb 28 17:20:10 2018	(r330122)
+++ stable/11/stand/defs.mk	Wed Feb 28 18:31:35 2018	(r330123)
@@ -149,6 +149,7 @@ CLEANFILES+=${_ILINKS}
 
 all: ${PROG}
 
+.if !defined(NO_OBJ)
 beforedepend: ${_ILINKS}
 beforebuild: ${_ILINKS}
 
@@ -176,5 +177,5 @@ ${_ILINKS}:
 	path=`(cd $$path && /bin/pwd)` ; \
 	${ECHO} ${.TARGET:T} "->" $$path ; \
 	ln -fhs $$path ${.TARGET:T}
-
+.endif
 .endif # __BOOT_DEFS_MK__

Modified: stable/11/stand/efi/Makefile
==============================================================================
--- stable/11/stand/efi/Makefile	Wed Feb 28 17:20:10 2018	(r330122)
+++ stable/11/stand/efi/Makefile	Wed Feb 28 18:31:35 2018	(r330123)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+NO_OBJ=t
+
 .include <bsd.init.mk>
 
 # In-tree GCC does not support __attribute__((ms_abi)), but gcc newer

Modified: stable/11/stand/i386/Makefile
==============================================================================
--- stable/11/stand/i386/Makefile	Wed Feb 28 17:20:10 2018	(r330122)
+++ stable/11/stand/i386/Makefile	Wed Feb 28 18:31:35 2018	(r330123)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+NO_OBJ=t
+
 .include <bsd.init.mk>
 
 SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \

Modified: stable/11/stand/mips/Makefile
==============================================================================
--- stable/11/stand/mips/Makefile	Wed Feb 28 17:20:10 2018	(r330122)
+++ stable/11/stand/mips/Makefile	Wed Feb 28 18:31:35 2018	(r330123)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+NO_OBJ=t
+
 SUBDIR= 	uboot
 
 #

Modified: stable/11/stand/powerpc/Makefile
==============================================================================
--- stable/11/stand/powerpc/Makefile	Wed Feb 28 17:20:10 2018	(r330122)
+++ stable/11/stand/powerpc/Makefile	Wed Feb 28 18:31:35 2018	(r330123)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+NO_OBJ=t
+
 .include <bsd.init.mk>
 
 SUBDIR=		boot1.chrp ofw uboot

Modified: stable/11/stand/sparc64/Makefile
==============================================================================
--- stable/11/stand/sparc64/Makefile	Wed Feb 28 17:20:10 2018	(r330122)
+++ stable/11/stand/sparc64/Makefile	Wed Feb 28 18:31:35 2018	(r330123)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+NO_OBJ=t
+
 .include <bsd.init.mk>
 
 SUBDIR=	boot1 loader