From c1c196e645e21a0f87d4e5f15681163f9fa8f938 Mon Sep 17 00:00:00 2001 From: bdrewery Date: Sat, 18 Nov 2017 21:27:33 +0000 Subject: [PATCH] Remove unneeded special case for .OBJDIR=.CURDIR. The else statement is already handling this by ensuring a safe .OBJDIR is used. Sponsored by: Dell --- share/mk/src.sys.obj.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/share/mk/src.sys.obj.mk b/share/mk/src.sys.obj.mk index 3671f974742a..280150b6c7ad 100644 --- a/share/mk/src.sys.obj.mk +++ b/share/mk/src.sys.obj.mk @@ -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