d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add NO_OBJ to those directories that don't make anything.

Browse Source 
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.
This commit is contained in:
Warner Losh 2018-02-26 03:16:04 +00:00
parent e6939726ef
commit 0c38f15ac7
8 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stand/arm/Makefile
View File

@ -1,5 +1,7 @@
# $FreeBSD$ # $FreeBSD$
NO_OBJ=t
SUBDIR= uboot SUBDIR= uboot
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

3
stand/defs.mk
View File

@ -163,6 +163,7 @@ CLEANFILES+=${_ILINKS}
all: ${PROG} all: ${PROG}
.if !defined(NO_OBJ)
beforedepend: ${_ILINKS} beforedepend: ${_ILINKS}
beforebuild: ${_ILINKS} beforebuild: ${_ILINKS}
@ -190,5 +191,5 @@ ${_ILINKS}:
path=`(cd $$path && /bin/pwd)` ; \ path=`(cd $$path && /bin/pwd)` ; \
${ECHO} ${.TARGET:T} "->" $$path ; \ ${ECHO} ${.TARGET:T} "->" $$path ; \
ln -fhs $$path ${.TARGET:T} ln -fhs $$path ${.TARGET:T}
.endif
.endif # __BOOT_DEFS_MK__ .endif # __BOOT_DEFS_MK__

2
stand/efi/Makefile
View File

@ -1,5 +1,7 @@
# $FreeBSD$ # $FreeBSD$
NO_OBJ=t
.include <bsd.init.mk> .include <bsd.init.mk>
# In-tree GCC does not support __attribute__((ms_abi)), but gcc newer # In-tree GCC does not support __attribute__((ms_abi)), but gcc newer

2
stand/forth/Makefile
View File

@ -1,5 +1,7 @@
# $FreeBSD$ # $FreeBSD$
NO_OBJ=t
.include <bsd.init.mk> .include <bsd.init.mk>
MAN+= beastie.4th.8 \ MAN+= beastie.4th.8 \

2
stand/i386/Makefile
View File

@ -1,5 +1,7 @@
# $FreeBSD$ # $FreeBSD$
NO_OBJ=t
.include <bsd.init.mk> .include <bsd.init.mk>
SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \ SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \

2
stand/mips/Makefile
View File

@ -1,5 +1,7 @@
# $FreeBSD$ # $FreeBSD$
NO_OBJ=t
SUBDIR= uboot SUBDIR= uboot
# #

2
stand/powerpc/Makefile
View File

@ -1,5 +1,7 @@
# $FreeBSD$ # $FreeBSD$
NO_OBJ=t
.include <bsd.init.mk> .include <bsd.init.mk>
SUBDIR= boot1.chrp ofw uboot SUBDIR= boot1.chrp ofw uboot

2
stand/sparc64/Makefile
View File

@ -1,5 +1,7 @@
# $FreeBSD$ # $FreeBSD$
NO_OBJ=t
.include <bsd.init.mk> .include <bsd.init.mk>
SUBDIR= boot1 loader SUBDIR= boot1 loader