@@ -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

@@ -65,7 +65,7 @@ source "${MAKEDIR}/.go-autogen"

 		"${BUILDFLAGS[@]}" \

 		-ldflags "

 		$LDFLAGS

-		$LDFLAGS_STATIC_DOCKER

+		$LDFLAGS_STATIC

 		$DOCKER_LDFLAGS

 	" \

 		${GO_PACKAGE}

@@ -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

@@ -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