Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk	(revision 267841)
+++ share/mk/src.opts.mk	(working copy)
@@ -181,12 +181,16 @@
 # Additional, per-target behavior should be rarely added only after much
 # gnashing of teeth and grinding of gears.
 #
-.if defined(TARGET_ARCH)
+.if defined(XDEV_ARCH)
+__T=${XDEV_ARCH}
+.elif defined(TARGET_ARCH)
 __T=${TARGET_ARCH}
 .else
 __T=${MACHINE_ARCH}
 .endif
-.if defined(TARGET)
+.if ${XDEV}
+__TT=${XDEV}
+.elif defined(TARGET)
 __TT=${TARGET}
 .else
 __TT=${MACHINE}