diff --git a/hack/common.sh b/hack/common.sh index 1731efa3721e..d977b533b1d1 100755 --- a/hack/common.sh +++ b/hack/common.sh @@ -219,11 +219,17 @@ os::build::internal::build_binaries() { local platform_gotags_envvar=OS_GOFLAGS_TAGS_$(echo ${platform} | tr '[:lower:]/' '[:upper:]_') local platform_gotags_test_envvar=OS_GOFLAGS_TAGS_TEST_$(echo ${platform} | tr '[:lower:]/' '[:upper:]_') + # work around https://github.com/golang/go/issues/11887 + local local_ldflags="${version_ldflags}" + if [[ "${platform}" == "darwin/amd64" ]]; then + local_ldflags+=" -s" + fi + if [[ ${#nonstatics[@]} -gt 0 ]]; then GOOS=${platform%/*} GOARCH=${platform##*/} go install \ -pkgdir "${OS_OUTPUT_PKGDIR}/${platform}" \ -tags "${OS_GOFLAGS_TAGS-} ${!platform_gotags_envvar:-}" \ - -ldflags "${version_ldflags}" \ + -ldflags="${local_ldflags}" \ "${goflags[@]:+${goflags[@]}}" \ "${nonstatics[@]}" @@ -240,7 +246,7 @@ os::build::internal::build_binaries() { CGO_ENABLED="${OS_TEST_CGO_ENABLED:-}" GOOS=${platform%/*} GOARCH=${platform##*/} go test \ -pkgdir "${OS_OUTPUT_PKGDIR}/${platform}" \ -tags "${OS_GOFLAGS_TAGS-} ${!platform_gotags_test_envvar:-}" \ - -ldflags "${version_ldflags}" \ + -ldflags "${local_ldflags}" \ -i -c -o "${outfile}" \ "${goflags[@]:+${goflags[@]}}" \ "$(dirname ${test})"