mirror of https://github.com/k3s-io/k3s
Merge pull request #37834 from ixdy/goroot-local-build
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 @iTagirpull/6/head
commit
c4e891690f
|
@ -219,8 +219,6 @@ kube::golang::set_platform_envs() {
|
|||
[[ -n ${1-} ]] || {
|
||||
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 GOARCH=${platform##*/}
|
||||
|
|
Loading…
Reference in New Issue