From d7a7d4da08469ccb4797a66e234242215c0251b1 Mon Sep 17 00:00:00 2001
From: Victor Marmol <vmarmol@google.com>
Date: Mon, 16 Mar 2015 16:03:46 -0700
Subject: [PATCH] Revert #5479, don't force no cgo.

We allow cgo when available since some of our server components (mainly
Kubelet) rely on it. The current driving factor for the static binaries
was building Docker images from scratch. We will instead use images
built from small busybox bases.

Fixes #5517
---
 hack/lib/golang.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index 57bd5fafc04..ca6cffe5e69 100644
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -296,13 +296,13 @@ kube::golang::build_binaries() {
           if [[ ${GOOS} == "windows" ]]; then
             bin="${bin}.exe"
           fi
-          CGO_ENABLED=0 go build -installsuffix cgo -o "${output_path}/${bin}" \
+          go build -o "${output_path}/${bin}" \
               "${goflags[@]:+${goflags[@]}}" \
               -ldflags "${version_ldflags}" \
               "${binary}"
         done
       else
-        CGO_ENABLED=0 go install -installsuffix cgo "${goflags[@]:+${goflags[@]}}" \
+        go install "${goflags[@]:+${goflags[@]}}" \
             -ldflags "${version_ldflags}" \
             "${binaries[@]}"
       fi