Merge pull request #5527 from vmarmol/e2e

Revert #5479, don't force no cgo.
This commit is contained in:
Zach Loafman 2015-03-16 16:28:16 -07:00
commit 278b741203

View File

@ -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