hack: remove unnecessary vars in make.sh script

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com> (cherry picked from commit 877baae) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
moby · Jan 30, 2023 · b7e0725 · b7e0725
1 parent 9674623
commit b7e0725
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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