D54819.id170222.diff
No OneTemporary
Actions

Size

986 B

Referenced Files

None

Subscribers

None

D54819.id170222.diff
View Options

	diff --git a/share/mk/src.sys.obj.mk b/share/mk/src.sys.obj.mk
	--- a/share/mk/src.sys.obj.mk
	+++ b/share/mk/src.sys.obj.mk
	@@ -88,18 +88,22 @@
	# in the source tree.
	.if ${MK_UNIFIED_OBJDIR} == "yes" && ${SRCTOP} != ${OBJROOT:tA}
	.if defined(TARGET) && defined(TARGET_ARCH)
	-OBJTOP:= ${OBJROOT}${TARGET}.${TARGET_ARCH}
	+OBJTOP:= ${OBJROOT}$${TARGET}.$${TARGET_ARCH}
	.elif defined(TARGET) && ${.CURDIR} == ${SRCTOP}
	# Not enough information, just use basic OBJDIR. This can happen with some
	# 'make universe' targets or if TARGET is not being used as expected.
	OBJTOP:= ${OBJROOT:H}
	.else
	-OBJTOP:= ${OBJROOT}${MACHINE}.${MACHINE_ARCH}
	+OBJTOP:= ${OBJROOT}$${MACHINE}.$${MACHINE_ARCH}
	.endif
	.else
	# TARGET.TARGET_ARCH handled in OBJROOT already.
	OBJTOP:= ${OBJROOT:H}
	.endif # ${MK_UNIFIED_OBJDIR} == "yes"
	+# export but do not track
	+.export-env OBJTOP
	+# resolve if needed
	+OBJTOP:= ${OBJTOP}
	.endif # empty(OBJTOP)

	# Fixup OBJROOT/OBJTOP if using MAKEOBJDIRPREFIX.