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

Merge pull request #104164 from dims/allow-override-of-cgo-enabled

Browse Source 
Allow override of KUBE_CGO_OVERRIDES (for switching on/off of `CGO_ENABLED`)
This commit is contained in:
Kubernetes Prow Robot 2021-08-05 16:37:26 -07:00 committed by GitHub
commit 0427b17395
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/common.sh
View File

@ -519,6 +519,7 @@ function kube::build::run_build_command_ex() {
--env "KUBE_VERBOSE=${KUBE_VERBOSE}" --env "KUBE_VERBOSE=${KUBE_VERBOSE}"
--env "KUBE_BUILD_WITH_COVERAGE=${KUBE_BUILD_WITH_COVERAGE:-}" --env "KUBE_BUILD_WITH_COVERAGE=${KUBE_BUILD_WITH_COVERAGE:-}"
--env "KUBE_BUILD_PLATFORMS=${KUBE_BUILD_PLATFORMS:-}" --env "KUBE_BUILD_PLATFORMS=${KUBE_BUILD_PLATFORMS:-}"
--env "KUBE_CGO_OVERRIDES=' ${KUBE_CGO_OVERRIDES[*]:-} '"
--env "GOFLAGS=${GOFLAGS:-}" --env "GOFLAGS=${GOFLAGS:-}"
--env "GOGCFLAGS=${GOGCFLAGS:-}" --env "GOGCFLAGS=${GOGCFLAGS:-}"
--env "SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH:-}" --env "SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH:-}"

2
hack/lib/golang.sh
View File

@ -716,6 +716,7 @@ kube::golang::build_binaries_for_platform() {
-ldflags "${goldflags:-}" -ldflags "${goldflags:-}"
-tags "${gotags:-}" -tags "${gotags:-}"
) )
V=1 kube::log::info "> static build CGO_ENABLED=0: ${statics[*]}"
CGO_ENABLED=0 kube::golang::build_some_binaries "${statics[@]}" CGO_ENABLED=0 kube::golang::build_some_binaries "${statics[@]}"
fi fi
@ -728,6 +729,7 @@ kube::golang::build_binaries_for_platform() {
-buildmode pie -buildmode pie
-tags "${gotags:-}" -tags "${gotags:-}"
) )
V=1 kube::log::info "> non-static build: ${nonstatics[*]}"
kube::golang::build_some_binaries "${nonstatics[@]}" kube::golang::build_some_binaries "${nonstatics[@]}"
fi fi