Skip to content

K
k3s
Unverified Commit 71152575 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #76651 from dims/move-goldflags-to-an-overrideable-default

Move "-s -w" flags to GOLDFLAGS as an overridable default.
parents 17fe18bd 7e01702a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
hack/.shellcheck_failures
View file @ 71152575
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
./hack/cherry_pick_pull.sh ./hack/cherry_pick_pull.sh
./hack/ginkgo-e2e.sh ./hack/ginkgo-e2e.sh
./hack/grab-profiles.sh ./hack/grab-profiles.sh
./hack/lib/golang.sh
./hack/lib/init.sh ./hack/lib/init.sh
./hack/lib/swagger.sh ./hack/lib/swagger.sh
./hack/lib/test.sh ./hack/lib/test.sh
......
hack/lib/golang.sh
View file @ 71152575
...@@ -693,7 +693,7 @@ kube::golang::build_binaries() { ...@@ -693,7 +693,7 @@ kube::golang::build_binaries() {
host_platform=$(kube::golang::host_platform) host_platform=$(kube::golang::host_platform)
local goflags goldflags goasmflags gogcflags local goflags goldflags goasmflags gogcflags
goldflags="${GOLDFLAGS:-} -s -w $(kube::version::ldflags)" goldflags="${GOLDFLAGS=-s -w} $(kube::version::ldflags)"
goasmflags="-trimpath=${KUBE_ROOT}" goasmflags="-trimpath=${KUBE_ROOT}"
gogcflags="${GOGCFLAGS:-} -trimpath=${KUBE_ROOT}" gogcflags="${GOGCFLAGS:-} -trimpath=${KUBE_ROOT}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment