From b7e0725e98d659890ba37d9320ad5303f0425f8b Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Wed, 18 Jan 2023 20:24:31 +0100 Subject: [PATCH] hack: remove unnecessary vars in make.sh script Signed-off-by: CrazyMax (cherry picked from commit 877baae03e1810b6a6afaa8b767b8df25f5c5cae) Signed-off-by: Sebastiaan van Stijn --- hack/make.sh | 8 +------- hack/make/.binary | 2 +- hack/make/dynbinary-daemon | 2 +- hack/make/dynbinary-proxy | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/hack/make.sh b/hack/make.sh index a7ace86767..5b6457fdb1 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -110,14 +110,8 @@ if [ -z "$DOCKER_DEBUG" ]; then LDFLAGS='-w' fi -LDFLAGS_STATIC='' -EXTLDFLAGS_STATIC='-static' BUILDFLAGS=(${BUILDFLAGS} -tags "netgo osusergo static_build $DOCKER_BUILDTAGS") - -LDFLAGS_STATIC_DOCKER=" - $LDFLAGS_STATIC - -extldflags \"$EXTLDFLAGS_STATIC\" -" +LDFLAGS_STATIC="-extldflags -static" if [ "$(uname -s)" = 'FreeBSD' ]; then # Tell cgo the compiler is Clang, not GCC diff --git a/hack/make/.binary b/hack/make/.binary index e592985929..07e1fee6db 100644 --- a/hack/make/.binary +++ b/hack/make/.binary @@ -68,7 +68,7 @@ source "${MAKEDIR}/.go-autogen" "${BUILDFLAGS[@]}" \ -ldflags " $LDFLAGS - $LDFLAGS_STATIC_DOCKER + $LDFLAGS_STATIC $DOCKER_LDFLAGS " \ ${GO_PACKAGE} diff --git a/hack/make/dynbinary-daemon b/hack/make/dynbinary-daemon index efb69df754..22dfe288ef 100644 --- a/hack/make/dynbinary-daemon +++ b/hack/make/dynbinary-daemon @@ -4,7 +4,7 @@ set -e [ -z "$KEEPDEST" ] && rm -rf "$DEST" ( - export LDFLAGS_STATIC_DOCKER='' + export LDFLAGS_STATIC='' export BUILDFLAGS=("${BUILDFLAGS[@]/netgo /}") # disable netgo, since we don't need it for a dynamic binary export BUILDFLAGS=("${BUILDFLAGS[@]/osusergo /}") # ditto for osusergo export BUILDFLAGS=("${BUILDFLAGS[@]/static_build /}") # we're not building a "static" binary here diff --git a/hack/make/dynbinary-proxy b/hack/make/dynbinary-proxy index 048bd9d2b2..d732df13a4 100644 --- a/hack/make/dynbinary-proxy +++ b/hack/make/dynbinary-proxy @@ -3,7 +3,7 @@ set -e ( - export LDFLAGS_STATIC_DOCKER='' + export LDFLAGS_STATIC='' export BUILDFLAGS=("${BUILDFLAGS[@]/netgo /}") # disable netgo, since we don't need it for a dynamic binary export BUILDFLAGS=("${BUILDFLAGS[@]/osusergo /}") # ditto for osusergo export BUILDFLAGS=("${BUILDFLAGS[@]/static_build /}") # we're not building a "static" binary here