github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8765 from eparis/hack-test-failure

Browse Source 
Fix build with --use_go_build (e2e.test failure)
This commit is contained in:
Tim Hockin 2015-05-27 12:43:04 -07:00
commit a3d5367156
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hack/lib/golang.sh
View File

@ -329,20 +329,20 @@ kube::golang::build_binaries_for_platform() {
if [[ -n ${use_go_build:-} ]]; then if [[ -n ${use_go_build:-} ]]; then
kube::log::progress " " kube::log::progress " "
for binary in "${binaries[@]}"; do for binary in "${statics[@]:+${statics[@]}}"; do
local outfile=$(kube::golang::output_filename_for_binary "${binary}" \ local outfile=$(kube::golang::output_filename_for_binary "${binary}" "${platform}")
"${platform}") CGO_ENABLED=0 go build -o "${outfile}" \
if kube::golang::is_statically_linked_library "${binary}"; then "${goflags[@]:+${goflags[@]}}" \
CGO_ENABLED=0 go build -o "${outfile}" \ -ldflags "${version_ldflags}" \
"${goflags[@]:+${goflags[@]}}" \ "${binary}"
-ldflags "${version_ldflags}" \ kube::log::progress "*"
"${binary}" done
else for binary in "${nonstatics[@]:+${nonstatics[@]}}"; do
go build -o "${outfile}" \ local outfile=$(kube::golang::output_filename_for_binary "${binary}" "${platform}")
"${goflags[@]:+${goflags[@]}}" \ go build -o "${outfile}" \
-ldflags "${version_ldflags}" \ "${goflags[@]:+${goflags[@]}}" \
"${binary}" -ldflags "${version_ldflags}" \
fi "${binary}"
kube::log::progress "*" kube::log::progress "*"
done done
kube::log::progress "\n" kube::log::progress "\n"