diff options
| author | CrazyMax <crazy-max@users.noreply.github.com> | 2023-01-18 20:24:31 +0100 |
|---|---|---|
| committer | CrazyMax <crazy-max@users.noreply.github.com> | 2023-01-19 21:33:38 +0100 |
| commit | 877baae03e1810b6a6afaa8b767b8df25f5c5cae (patch) | |
| tree | 095ccc7932f68135bbb15cbd08332f62768a345d /hack | |
| parent | b80f16157e7ce98eeeb874c575bb34a1caa88e8d (diff) | |
| download | docker-877baae03e1810b6a6afaa8b767b8df25f5c5cae.tar.gz | |
hack: remove unnecessary vars in make.sh script
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Diffstat (limited to 'hack')
| -rwxr-xr-x | hack/make.sh | 8 | ||||
| -rw-r--r-- | hack/make/.binary | 2 | ||||
| -rw-r--r-- | hack/make/dynbinary-daemon | 2 | ||||
| -rw-r--r-- | hack/make/dynbinary-proxy | 2 |
4 files changed, 4 insertions, 10 deletions
diff --git a/hack/make.sh b/hack/make.sh index 3a10e08aed..189ee5aa8b 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -108,14 +108,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 64fbadcd79..0e7022ce41 100644 --- a/hack/make/.binary +++ b/hack/make/.binary @@ -65,7 +65,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 |