Skip to content

K
k3s
Commit 278b7412 authored by Zach Loafman's avatar Zach Loafman
Browse files
Options

Merge pull request #5527 from vmarmol/e2e

Revert #5479, don't force no cgo.
parents 2fee5ba0 d7a7d4da
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
hack/lib/golang.sh
View file @ 278b7412
...@@ -296,13 +296,13 @@ kube::golang::build_binaries() { ...@@ -296,13 +296,13 @@ kube::golang::build_binaries() {
if [[ ${GOOS} == "windows" ]]; then if [[ ${GOOS} == "windows" ]]; then
bin="${bin}.exe" bin="${bin}.exe"
fi fi
CGO_ENABLED=0 go build -installsuffix cgo -o "${output_path}/${bin}" \ go build -o "${output_path}/${bin}" \
"${goflags[@]:+${goflags[@]}}" \ "${goflags[@]:+${goflags[@]}}" \
-ldflags "${version_ldflags}" \ -ldflags "${version_ldflags}" \
"${binary}" "${binary}"
done done
else else
CGO_ENABLED=0 go install -installsuffix cgo "${goflags[@]:+${goflags[@]}}" \ go install "${goflags[@]:+${goflags[@]}}" \
-ldflags "${version_ldflags}" \ -ldflags "${version_ldflags}" \
"${binaries[@]}" "${binaries[@]}"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment