svn commit: r325672 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Fri Nov 10 19:52:31 2017
New Revision: 325672
URL: https://svnweb.freebsd.org/changeset/base/325672

Log:
  Don't append TARGET.TARGET_ARCH if OBJTOP is already set.
  
  This avoids flipping the expected TARGET.TARGET_ARCH suffix / OBJTOP when it is
  already set by a parent make which wants to control it more such as in
  something like 'make native-xtools'.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/share/mk/src.sys.obj.mk

Modified: head/share/mk/src.sys.obj.mk
==============================================================================
--- head/share/mk/src.sys.obj.mk	Fri Nov 10 19:10:14 2017	(r325671)
+++ head/share/mk/src.sys.obj.mk	Fri Nov 10 19:52:31 2017	(r325672)
@@ -70,6 +70,7 @@ OBJROOT:=	${OBJROOT:H:tA}/${OBJROOT:T}
 .export OBJROOT SRCTOP
 .endif
 
+.if empty(OBJTOP)
 # SRCTOP == OBJROOT only happens with clever MAKEOBJDIRPREFIX=/.  Don't
 # append TARGET.TARGET_ARCH for that case since the user wants to build
 # in the source tree.
@@ -79,6 +80,7 @@ OBJTOP:=	${OBJROOT}${TARGET:D${TARGET}.${TARGET_ARCH}:
 # TARGET.TARGET_ARCH handled in OBJROOT already.
 OBJTOP:=	${OBJROOT:H}
 .endif	# ${MK_UNIFIED_OBJDIR} == "yes"
+.endif
 
 # Fixup OBJROOT/OBJTOP if using MAKEOBJDIRPREFIX but leave it alone
 # for DIRDEPS_BUILD which really wants to know the absolute top at