Skip to content

Commit

Permalink
Revert kubernetes#5479, don't force no cgo.
Browse files Browse the repository at this point in the history
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 kubernetes#5517
  • Loading branch information
vmarmol committed Mar 16, 2015
1 parent 0b67c9e commit d7a7d4d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions hack/lib/golang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d7a7d4d

Please sign in to comment.