system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 12:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded special case for .OBJDIR=.CURDIR.

Browse source 
The else statement is already handling this by ensuring a safe .OBJDIR is used.

Sponsored by:	Dell
This commit is contained in:
Bryan Drewery 2017-11-18 21:27:33 +00:00
parent 3f9ade0643
commit 4a76893d57
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=325986
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
share/mk/src.sys.obj.mk
View file

@ -192,13 +192,6 @@ MK_AUTO_OBJ:= ${__objdir_writable}
# The expected OBJDIR already exists, set it as .OBJDIR.
.if !empty(__objdir) && exists(${__objdir})
.OBJDIR: ${__objdir}
# Special case to work around bmake bug. If the top-level .OBJDIR does not yet
# exist and MAKEOBJDIR is passed into environment and yield a blank value,
# bmake will incorrectly set .OBJDIR=${SRCTOP}/ rather than the expected
# ${SRCTOP} to match ${.CURDIR}.
.elif ${MAKE_VERSION} <= 20170720 && \
${.CURDIR} == ${SRCTOP} && ${.OBJDIR} == ${SRCTOP}/
.OBJDIR: ${.CURDIR}
.else
# The OBJDIR we wanted does not yet exist, ensure we default to safe .CURDIR
# in case make started with a bogus MAKEOBJDIR, that expanded before OBJTOP