Skip to content

Commit 7e01702

Browse files
committed
Move "-s -w" flags to GOLDFLAGS as an overridable default.
If GOLDFLAGS is set, whether it is empty or not, we should honor it. Only if the GOLDFLAGS is totally not set, then we use "-s -w" See Parameter Expansion section in the urls below: https://stackoverflow.com/questions/3601515/how-to-check-if-a-variable-is-set-in-bash/16753536 http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_02 Change-Id: I826c34efc63c77f0e3e9677fff30a3eb2219a377
1 parent e4a4365 commit 7e01702

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

hack/.shellcheck_failures

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
./hack/cherry_pick_pull.sh
2828
./hack/ginkgo-e2e.sh
2929
./hack/grab-profiles.sh
30+
./hack/lib/golang.sh
3031
./hack/lib/init.sh
3132
./hack/lib/swagger.sh
3233
./hack/lib/test.sh

hack/lib/golang.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ kube::golang::build_binaries() {
693693
host_platform=$(kube::golang::host_platform)
694694

695695
local goflags goldflags goasmflags gogcflags
696-
goldflags="${GOLDFLAGS:-} -s -w $(kube::version::ldflags)"
696+
goldflags="${GOLDFLAGS=-s -w} $(kube::version::ldflags)"
697697
goasmflags="-trimpath=${KUBE_ROOT}"
698698
gogcflags="${GOGCFLAGS:-} -trimpath=${KUBE_ROOT}"
699699

0 commit comments

Comments
 (0)