scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: clean platform envs to prevent cross-contamination

Browse Source
This commit is contained in:
Jeff Grafton
2016-11-29 16:16:17 -08:00
parent ea576b7c53
commit 9848d6cc8d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hack/lib/golang.sh
View File

@@ -219,6 +219,8 @@ kube::golang::set_platform_envs() {
[[ -n ${1-} ]] || { [[ -n ${1-} ]] || {
kube::log::error_exit "!!! Internal error. No platform set in kube::golang::set_platform_envs" kube::log::error_exit "!!! Internal error. No platform set in kube::golang::set_platform_envs"
} }
# make sure we have a clean slate first
kube::golang::unset_platform_envs
export GOOS=${platform%/*} export GOOS=${platform%/*}
export GOARCH=${platform##*/} export GOARCH=${platform##*/}
@@ -456,6 +458,8 @@ kube::golang::build_binaries_for_platform() {
local -a nonstatics=() local -a nonstatics=()
local -a tests=() local -a tests=()
V=2 kube::log::info "Env for ${platform}: GOOS=${GOOS-} GOARCH=${GOARCH-} GOROOT=${GOROOT-} CGO_ENABLED=${CGO_ENABLED-} CC=${CC-}"
for binary in "${binaries[@]}"; do for binary in "${binaries[@]}"; do
if [[ "${binary}" =~ ".test"$ ]]; then if [[ "${binary}" =~ ".test"$ ]]; then
@@ -685,8 +689,10 @@ kube::golang::build_binaries() {
else else
for platform in "${platforms[@]}"; do for platform in "${platforms[@]}"; do
kube::log::status "Building go targets for ${platform}:" "${targets[@]}" kube::log::status "Building go targets for ${platform}:" "${targets[@]}"
kube::golang::set_platform_envs "${platform}" (
kube::golang::build_binaries_for_platform ${platform} ${use_go_build:-} kube::golang::set_platform_envs "${platform}"
kube::golang::build_binaries_for_platform ${platform} ${use_go_build:-}
)
done done
fi fi
) )