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

Merge pull request #37834 from ixdy/goroot-local-build

Browse Source 
Automatic merge from submit-queue

build: don't call unset_platform_envs before building

**What this PR does / why we need it**: unbreaks local builds that override `GOROOT`.

It partially reverts #37665, but the sub-shelling introduced in #37665 remains and should continue to fix #37079. 

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #37802

cc @jsafrane @sttts @sebgoa @iTagir
This commit is contained in:
Kubernetes Submit Queue 2016-12-02 01:00:31 -08:00 committed by GitHub
commit c4e891690f
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/lib/golang.sh
View File

@ -219,8 +219,6 @@ 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##*/}