github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix unbounded host_platform when building with --use_go_build 

It's actually used unset a couple of lines after this patch, but this
just resolves it in one place instead of calling
$(kube::golang::host_platform) twice.
pull/6/head
Eric Paris 2014-11-04 13:58:06 -05:00
parent 652a0ce4db
commit 8a0e3e51e0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hack/lib/golang.sh
View File

@ -233,6 +233,9 @@ kube::golang::build_binaries() {
local version_ldflags local version_ldflags
version_ldflags=$(kube::version::ldflags) version_ldflags=$(kube::version::ldflags)
local host_platform
host_platform=$(kube::golang::host_platform)
# Use eval to preserve embedded quoted strings. # Use eval to preserve embedded quoted strings.
local goflags local goflags
eval "goflags=(${KUBE_GOFLAGS:-})" eval "goflags=(${KUBE_GOFLAGS:-})"
@ -257,7 +260,7 @@ kube::golang::build_binaries() {
local -a platforms=("${KUBE_BUILD_PLATFORMS[@]:+${KUBE_BUILD_PLATFORMS[@]}}") local -a platforms=("${KUBE_BUILD_PLATFORMS[@]:+${KUBE_BUILD_PLATFORMS[@]}}")
if [[ ${#platforms[@]} -eq 0 ]]; then if [[ ${#platforms[@]} -eq 0 ]]; then
platforms=("$(kube::golang::host_platform)") platforms=("${host_platform}")
fi fi
local binaries local binaries