Преглед изворни кода

hack: remove unnecessary vars in make.sh script

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
CrazyMax пре 2 година
родитељ
комит
877baae03e
4 измењених фајлова са 4 додато и 10 уклоњено
  1. 1 7
      hack/make.sh
  2. 1 1
      hack/make/.binary
  3. 1 1
      hack/make/dynbinary-daemon
  4. 1 1
      hack/make/dynbinary-proxy

+ 1 - 7
hack/make.sh

@@ -108,14 +108,8 @@ if [ -z "$DOCKER_DEBUG" ]; then
 	LDFLAGS='-w'
 	LDFLAGS='-w'
 fi
 fi
 
 
-LDFLAGS_STATIC=''
-EXTLDFLAGS_STATIC='-static'
 BUILDFLAGS=(${BUILDFLAGS} -tags "netgo osusergo static_build $DOCKER_BUILDTAGS")
 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
 if [ "$(uname -s)" = 'FreeBSD' ]; then
 	# Tell cgo the compiler is Clang, not GCC
 	# Tell cgo the compiler is Clang, not GCC

+ 1 - 1
hack/make/.binary

@@ -65,7 +65,7 @@ source "${MAKEDIR}/.go-autogen"
 		"${BUILDFLAGS[@]}" \
 		"${BUILDFLAGS[@]}" \
 		-ldflags "
 		-ldflags "
 		$LDFLAGS
 		$LDFLAGS
-		$LDFLAGS_STATIC_DOCKER
+		$LDFLAGS_STATIC
 		$DOCKER_LDFLAGS
 		$DOCKER_LDFLAGS
 	" \
 	" \
 		${GO_PACKAGE}
 		${GO_PACKAGE}

+ 1 - 1
hack/make/dynbinary-daemon

@@ -4,7 +4,7 @@ set -e
 [ -z "$KEEPDEST" ] && rm -rf "$DEST"
 [ -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[@]/netgo /}")        # disable netgo, since we don't need it for a dynamic binary
 	export BUILDFLAGS=("${BUILDFLAGS[@]/osusergo /}")     # ditto for osusergo
 	export BUILDFLAGS=("${BUILDFLAGS[@]/osusergo /}")     # ditto for osusergo
 	export BUILDFLAGS=("${BUILDFLAGS[@]/static_build /}") # we're not building a "static" binary here
 	export BUILDFLAGS=("${BUILDFLAGS[@]/static_build /}") # we're not building a "static" binary here

+ 1 - 1
hack/make/dynbinary-proxy

@@ -3,7 +3,7 @@
 set -e
 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[@]/netgo /}")        # disable netgo, since we don't need it for a dynamic binary
 	export BUILDFLAGS=("${BUILDFLAGS[@]/osusergo /}")     # ditto for osusergo
 	export BUILDFLAGS=("${BUILDFLAGS[@]/osusergo /}")     # ditto for osusergo
 	export BUILDFLAGS=("${BUILDFLAGS[@]/static_build /}") # we're not building a "static" binary here
 	export BUILDFLAGS=("${BUILDFLAGS[@]/static_build /}") # we're not building a "static" binary here