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

AUTO_OBJ: For all top-level targets enforce using an OBJDIR.

Browse Source 
This will cause an error if the wanted OBJDIR is not writable.  Previously it
would cause the files to generate to the source tree.  This was too obscure and
things like buildworld really expect a proper OBJDIR layout.

Sponsored by:	Dell EMC
This commit is contained in:
Bryan Drewery 2017-12-05 21:29:47 +00:00
parent 34b8ef3d77
commit e22224a5c2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.sys.inc
View File

@ -38,6 +38,10 @@ MK_AUTO_OBJ= no
# just want to read any existing OBJDIR but we don't care if we can create # just want to read any existing OBJDIR but we don't care if we can create
# or write to them. # or write to them.
.MAKEOVERRIDES+= MK_AUTO_OBJ .MAKEOVERRIDES+= MK_AUTO_OBJ
.else
# For top-level we always assume the MAKEOBJDIRPREFIX is writable rather than
# falling back to .CURDIR.
__objdir_writable= yes
.endif .endif
.endif # empty(.MAKEOVERRIDES:MMK_AUTO_OBJ) .endif # empty(.MAKEOVERRIDES:MMK_AUTO_OBJ)

2
share/mk/src.sys.obj.mk
View File

@ -172,7 +172,7 @@ CheckAutoObj() { \
.if !empty(__objdir) .if !empty(__objdir)
.if ${.CURDIR} == ${__objdir} .if ${.CURDIR} == ${__objdir}
__objdir_writable?= yes __objdir_writable?= yes
.else .elif empty(__objdir_writable)
__objdir_writable!= \ __objdir_writable!= \
${CheckAutoObj}; CheckAutoObj "${__objdir}" || echo no ${CheckAutoObj}; CheckAutoObj "${__objdir}" || echo no
.endif .endif