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

Handle MAKEOBJDIRPREFIX when already inside of .OBJDIR.

Browse Source 
This can happen in obscure cases with things like the kernel build.

Sponsored by:	Dell EMC Isilon
This commit is contained in:
Bryan Drewery 2017-11-11 01:10:41 +00:00
parent f649ab27a3
commit f82493cc3a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=325696
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,12 @@ OBJROOT:= ${OBJTOP}/
# __objdir is the expected .OBJDIR we want to use and that auto.obj.mk will
# try to create.
.if !empty(MAKEOBJDIRPREFIX)
.if ${.CURDIR:M${MAKEOBJDIRPREFIX}/*} != ""
# we are already in obj tree!
__objdir= ${.CURDIR}
.else
__objdir:= ${MAKEOBJDIRPREFIX}${.CURDIR}
.endif
.elif !empty(MAKEOBJDIR)
__objdir:= ${MAKEOBJDIR}
.endif