From 4143850b006d0dd39029671fc5af62cfd3eae062 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 21 Jul 2016 06:06:11 +0000
Subject: [PATCH] Add LOCAL_XTOOL_DIRS to add into cross-tools.

Sponsored by:	EMC / Isilon Storage Division
---
 Makefile.inc1          | 3 +++
 share/man/man7/build.7 | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index e20ee3b816fc..30b7643b2f89 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -22,6 +22,8 @@
 #	    to be created before files are installed
 #	LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools
 #	    list
+#	LOCAL_XTOOL_DIRS="list of dirs" to add additional dirs to the
+#	    cross-tools target
 #	METALOG="path to metadata log" to write permission and ownership
 #	    when NO_ROOT is set.  (default: ${DESTDIR}/METALOG)
 #	TARGET="machine" to crossbuild world for a different machine type
@@ -1815,6 +1817,7 @@ _usb_tools=	sys/boot/usb/tools
 
 cross-tools: .MAKE .PHONY
 .for _tool in \
+    ${LOCAL_XTOOL_DIRS} \
     ${_clang_libs} \
     ${_clang} \
     ${_binutils} \
diff --git a/share/man/man7/build.7 b/share/man/man7/build.7
index 9c275746d6d6..11054689ca31 100644
--- a/share/man/man7/build.7
+++ b/share/man/man7/build.7
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 28, 2016
+.Dd July 20, 2016
 .Dt BUILD 7
 .Os
 .Sh NAME
@@ -462,6 +462,11 @@ If set, this variable supplies a list of additional directories relative to
 the root of the source tree to build as part of the
 .Cm build-tools
 target.
+.It Va LOCAL_XTOOL_DIRS
+If set, this variable supplies a list of additional directories relative to
+the root of the source tree to build as part of the
+.Cm cross-tools
+target.
 .It Va PORTS_MODULES
 A list of ports with kernel modules that should be built and installed
 as part of the