From af2129b77d019848cbbdeed8c4b4f383fd5c8539 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Thu, 5 Aug 2021 10:44:16 -0400 Subject: [PATCH] Allow override of `CGO_ENABLED=0` When building inside a docker container, we fail to pass along enough information for KUBE_CGO_OVERRIDES. The original PR was geared towards building the binary from the command line - dca376a03ef43df2714eafd431a76646346c9094 - e4ded2b3ecb3084bfb6111e81b2741bead8ccc14 Signed-off-by: Davanum Srinivas --- build/common.sh | 1 + hack/lib/golang.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/build/common.sh b/build/common.sh index 3c7f6afdd25..f4fc13fb0c8 100755 --- a/build/common.sh +++ b/build/common.sh @@ -519,6 +519,7 @@ function kube::build::run_build_command_ex() { --env "KUBE_VERBOSE=${KUBE_VERBOSE}" --env "KUBE_BUILD_WITH_COVERAGE=${KUBE_BUILD_WITH_COVERAGE:-}" --env "KUBE_BUILD_PLATFORMS=${KUBE_BUILD_PLATFORMS:-}" + --env "KUBE_CGO_OVERRIDES=' ${KUBE_CGO_OVERRIDES[*]:-} '" --env "GOFLAGS=${GOFLAGS:-}" --env "GOGCFLAGS=${GOGCFLAGS:-}" --env "SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH:-}" diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index a50a64af9c7..f581e1acd96 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -716,6 +716,7 @@ kube::golang::build_binaries_for_platform() { -ldflags "${goldflags:-}" -tags "${gotags:-}" ) + V=1 kube::log::info "> static build CGO_ENABLED=0: ${statics[*]}" CGO_ENABLED=0 kube::golang::build_some_binaries "${statics[@]}" fi @@ -728,6 +729,7 @@ kube::golang::build_binaries_for_platform() { -buildmode pie -tags "${gotags:-}" ) + V=1 kube::log::info "> non-static build: ${nonstatics[*]}" kube::golang::build_some_binaries "${nonstatics[@]}" fi