svn commit: r330004 - in head/stand: . arm efi forth i386 mips powerpc sparc64

Warner Losh imp at FreeBSD.org
Mon Feb 26 03:16:06 UTC 2018


Author: imp
Date: Mon Feb 26 03:16:04 2018
New Revision: 330004
URL: https://svnweb.freebsd.org/changeset/base/330004

Log:
  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.

Modified:
  head/stand/arm/Makefile
  head/stand/defs.mk
  head/stand/efi/Makefile
  head/stand/forth/Makefile
  head/stand/i386/Makefile
  head/stand/mips/Makefile
  head/stand/powerpc/Makefile
  head/stand/sparc64/Makefile

Modified: head/stand/arm/Makefile
==============================================================================
--- head/stand/arm/Makefile	Mon Feb 26 03:05:36 2018	(r330003)
+++ head/stand/arm/Makefile	Mon Feb 26 03:16:04 2018	(r330004)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+NO_OBJ=t
+
 SUBDIR=		uboot
 
 .include <bsd.subdir.mk>

Modified: head/stand/defs.mk
==============================================================================
--- head/stand/defs.mk	Mon Feb 26 03:05:36 2018	(r330003)
+++ head/stand/defs.mk	Mon Feb 26 03:16:04 2018	(r330004)
@@ -163,6 +163,7 @@ CLEANFILES+=${_ILINKS}
 
 all: ${PROG}
 
+.if !defined(NO_OBJ)
 beforedepend: ${_ILINKS}
 beforebuild: ${_ILINKS}
 
@@ -190,5 +191,5 @@ ${_ILINKS}:
 	path=`(cd $$path && /bin/pwd)` ; \
 	${ECHO} ${.TARGET:T} "->" $$path ; \
 	ln -fhs $$path ${.TARGET:T}
-
+.endif
 .endif # __BOOT_DEFS_MK__

Modified: head/stand/efi/Makefile
==============================================================================
--- head/stand/efi/Makefile	Mon Feb 26 03:05:36 2018	(r330003)
+++ head/stand/efi/Makefile	Mon Feb 26 03:16:04 2018	(r330004)
@@ -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: head/stand/forth/Makefile
==============================================================================
--- head/stand/forth/Makefile	Mon Feb 26 03:05:36 2018	(r330003)
+++ head/stand/forth/Makefile	Mon Feb 26 03:16:04 2018	(r330004)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+NO_OBJ=t
+
 .include <bsd.init.mk>
 
 MAN+=	beastie.4th.8 \

Modified: head/stand/i386/Makefile
==============================================================================
--- head/stand/i386/Makefile	Mon Feb 26 03:05:36 2018	(r330003)
+++ head/stand/i386/Makefile	Mon Feb 26 03:16:04 2018	(r330004)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+NO_OBJ=t
+
 .include <bsd.init.mk>
 
 SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \

Modified: head/stand/mips/Makefile
==============================================================================
--- head/stand/mips/Makefile	Mon Feb 26 03:05:36 2018	(r330003)
+++ head/stand/mips/Makefile	Mon Feb 26 03:16:04 2018	(r330004)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+NO_OBJ=t
+
 SUBDIR= 	uboot
 
 #

Modified: head/stand/powerpc/Makefile
==============================================================================
--- head/stand/powerpc/Makefile	Mon Feb 26 03:05:36 2018	(r330003)
+++ head/stand/powerpc/Makefile	Mon Feb 26 03:16:04 2018	(r330004)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+NO_OBJ=t
+
 .include <bsd.init.mk>
 
 SUBDIR=		boot1.chrp ofw uboot

Modified: head/stand/sparc64/Makefile
==============================================================================
--- head/stand/sparc64/Makefile	Mon Feb 26 03:05:36 2018	(r330003)
+++ head/stand/sparc64/Makefile	Mon Feb 26 03:16:04 2018	(r330004)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+NO_OBJ=t
+
 .include <bsd.init.mk>
 
 SUBDIR=	boot1 loader


More information about the svn-src-all mailing list