Merge pull request kubernetes#33857 from ixdy/automated-cherry-pick-o…

…f-#33803-upstream-release-1.4 Automatic merge from submit-queue Automated cherry pick of kubernetes#33803 Cherry pick of kubernetes#33803 on release-1.4. Fixes kubernetes#33801.
shyamjvs · Oct 1, 2016 · db23066 · db23066
2 parents b1137ae + 6492569
commit db23066
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
@@ -84,9 +84,11 @@ ENV K8S_PATCHED_GOLANG_VERSION=1.7.1 \
 RUN mkdir -p ${K8S_PATCHED_GOROOT} \
   && curl -sSL https://github.com/golang/go/archive/go${K8S_PATCHED_GOLANG_VERSION}.tar.gz | tar -xz -C ${K8S_PATCHED_GOROOT} --strip-components=1
 
+# We need a patched go1.7.1 for linux/arm (https://github.com/kubernetes/kubernetes/issues/29904)
+# We need go1.7.1 for all darwin builds (https://github.com/kubernetes/kubernetes/issues/32999)
 COPY golang-patches/CL28857-go1.7.1-luxas.patch ${K8S_PATCHED_GOROOT}/
 RUN cd ${K8S_PATCHED_GOROOT} \
   && patch -p1 < CL28857-go1.7.1-luxas.patch \
   && cd src \
   && GOROOT_FINAL=${K8S_PATCHED_GOROOT} GOROOT_BOOTSTRAP=/usr/local/go ./make.bash \
-  && for platform in linux/arm; do GOOS=${platform%/*} GOARCH=${platform##*/} GOROOT=${K8S_PATCHED_GOROOT} go install std; done
+  && for platform in linux/arm darwin/386 darwin/amd64; do GOOS=${platform%/*} GOARCH=${platform##*/} GOROOT=${K8S_PATCHED_GOROOT} go install std; done
diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.6.3-7
+v1.6.3-8
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
@@ -248,13 +248,17 @@ kube::golang::set_platform_envs() {
     if [[ ${platform} == "linux/arm" ]]; then
       export CGO_ENABLED=1
       export CC=arm-linux-gnueabi-gcc
+      # See https://github.com/kubernetes/kubernetes/issues/29904
       export GOROOT=${K8S_PATCHED_GOROOT}
     elif [[ ${platform} == "linux/arm64" ]]; then
       export CGO_ENABLED=1
       export CC=aarch64-linux-gnu-gcc
     elif [[ ${platform} == "linux/ppc64le" ]]; then
       export CGO_ENABLED=1
       export CC=powerpc64le-linux-gnu-gcc
+    elif [[ ${platform} == "darwin/"* ]]; then
+      # See https://github.com/kubernetes/kubernetes/issues/32999
+      export GOROOT=${K8S_PATCHED_GOROOT}
     fi
   fi
 }