From cf10dd450d14de2de2a0467182390c4a370dfcea Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 25 Nov 2015 19:44:58 +0000
Subject: [PATCH] Stop looking up the same id(1) results in sub-makes.

Sponsored by:	EMC / Isilon Storage Division
---
 share/mk/bsd.own.mk | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index cf3bee6b2f0..9f33424cae2 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -133,12 +133,23 @@ CTFCONVERT_CMD=	@:
 .endif 
 
 .if ${MK_INSTALL_AS_USER} != "no"
+.if !defined(_uid)
 _uid!=	id -u
+.export _uid
+.endif
 .if ${_uid} != 0
 .if !defined(USER)
-USER!=	id -un
+# Avoid exporting USER
+.if !defined(_USER)
+_USER!=	id -un
+.export _USER
 .endif
+USER=	${_USER}
+.endif
+.if !defined(_gid)
 _gid!=	id -g
+.export _gid
+.endif
 .for x in BIN CONF DOC DTB INFO KMOD LIB MAN NLS SHARE
 $xOWN=	${USER}
 $xGRP=	${_gid}