Merge pull request #2155 from eparis/go-build-fix

fix unbounded host_platform when building with --use_go_build
This commit is contained in:
Joe Beda 2014-11-04 11:02:51 -08:00
commit 5a649f2b93

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