From 9848d6cc8de816b4e04ffb4d77198059e9d5f33f Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Tue, 29 Nov 2016 16:16:17 -0800
Subject: [PATCH 1/2] build: clean platform envs to prevent cross-contamination

---
 hack/lib/golang.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index 34177640206..c91b12f0915 100755
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -219,6 +219,8 @@ kube::golang::set_platform_envs() {
   [[ -n ${1-} ]] || {
     kube::log::error_exit "!!! Internal error. No platform set in kube::golang::set_platform_envs"
   }
+  # make sure we have a clean slate first
+  kube::golang::unset_platform_envs
 
   export GOOS=${platform%/*}
   export GOARCH=${platform##*/}
@@ -456,6 +458,8 @@ kube::golang::build_binaries_for_platform() {
   local -a nonstatics=()
   local -a tests=()
 
+  V=2 kube::log::info "Env for ${platform}: GOOS=${GOOS-} GOARCH=${GOARCH-} GOROOT=${GOROOT-} CGO_ENABLED=${CGO_ENABLED-} CC=${CC-}"
+
   for binary in "${binaries[@]}"; do
 
     if [[ "${binary}" =~ ".test"$ ]]; then
@@ -685,8 +689,10 @@ kube::golang::build_binaries() {
     else
       for platform in "${platforms[@]}"; do
         kube::log::status "Building go targets for ${platform}:" "${targets[@]}"
-        kube::golang::set_platform_envs "${platform}"
-        kube::golang::build_binaries_for_platform ${platform} ${use_go_build:-}
+        (
+          kube::golang::set_platform_envs "${platform}"
+          kube::golang::build_binaries_for_platform ${platform} ${use_go_build:-}
+        )
       done
     fi
   )

From 130776154d5aa8faf5d0ac05b315464b6d8d152f Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Tue, 29 Nov 2016 17:30:20 -0800
Subject: [PATCH 2/2] Pass KUBE_VERBOSE into build container

---
 build-tools/common.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-tools/common.sh b/build-tools/common.sh
index 2774ea3911a..4fab3236857 100755
--- a/build-tools/common.sh
+++ b/build-tools/common.sh
@@ -560,6 +560,7 @@ function kube::build::run_build_command_ex() {
     --env "KUBE_FASTBUILD=${KUBE_FASTBUILD:-false}"
     --env "KUBE_BUILDER_OS=${OSTYPE:-notdetected}"
     --env "KUBE_BUILD_PPC64LE=${KUBE_BUILD_PPC64LE}"  # TODO(IBM): remove
+    --env "KUBE_VERBOSE=${KUBE_VERBOSE}"
   )
 
   # If we have stdin we can run interactive.  This allows things like 'shell.sh'