From 57dbde2ca8d4c493746569ec819faa3141d3d576 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 6 May 2015 16:21:12 +0000
Subject: buildenv_setup(), if overridden in the configuration file, only needs
 to be invoked once.

Sponsored by:	The FreeBSD Foundation
---
 release/release.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release/release.sh b/release/release.sh
index 1ba848b753a3..58f3d72460cf 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -278,12 +278,13 @@ extra_chroot_setup() {
 		done
 	fi
 
+	buildenv_setup
+
 	return 0
 } # extra_chroot_setup()
 
 # chroot_build_target(): Build the userland and kernel for the build target.
 chroot_build_target() {
-	buildenv_setup
 	load_target_env
 	if [ ! -z "${EMBEDDEDBUILD}" ]; then
 		RELEASE_WMAKEFLAGS="${RELEASE_WMAKEFLAGS} \
@@ -301,7 +302,6 @@ chroot_build_target() {
 
 # chroot_build_release(): Invoke the 'make release' target.
 chroot_build_release() {
-	buildenv_setup
 	load_target_env
 
 	if [ -z "${EMBEDDEDBUILD}" ]; then
-- 
cgit v1.2.3