From owner-svn-src-head@freebsd.org  Wed Nov 25 19:45:00 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D707EA3780B;
 Wed, 25 Nov 2015 19:45:00 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 146491E86;
 Wed, 25 Nov 2015 19:44:59 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAPJixWu004129;
 Wed, 25 Nov 2015 19:44:59 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAPJixaT004128;
 Wed, 25 Nov 2015 19:44:59 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201511251944.tAPJixaT004128@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 25 Nov 2015 19:44:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291323 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Nov 2015 19:45:00 -0000

Author: bdrewery
Date: Wed Nov 25 19:44:58 2015
New Revision: 291323
URL: https://svnweb.freebsd.org/changeset/base/291323

Log:
  Stop looking up the same id(1) results in sub-makes.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.own.mk

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Wed Nov 25 19:44:55 2015	(r291322)
+++ head/share/mk/bsd.own.mk	Wed Nov 25 19:44:58 2015	(r291323)
@@ -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}