Remove go patches for darwin

Signed-off-by: Jess Frazelle <[email protected]>
markturansky · Oct 14, 2016 · 3193174 · 3193174
1 parent d51962e
commit 3193174
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
@@ -85,10 +85,9 @@ 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 darwin/386 darwin/amd64; do GOOS=${platform%/*} GOARCH=${platform##*/} GOROOT=${K8S_PATCHED_GOROOT} go install std; done
+  && for platform in linux/arm; do GOOS=${platform%/*} GOARCH=${platform##*/} GOROOT=${K8S_PATCHED_GOROOT} go install std; done
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
@@ -238,9 +238,6 @@ kube::golang::set_platform_envs() {
     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
 }