From 02f68d68d6373abf66799588e4ab3e3b1670b720 Mon Sep 17 00:00:00 2001
From: Matt Robinson <mrobinson@storj.io>
Date: Fri, 27 Sep 2019 09:38:02 -0600
Subject: [PATCH] Put -s and -w in the right spot (#3135)

---
 Makefile           | 2 +-
 scripts/release.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ada44ff82..da75e311c 100644
--- a/Makefile
+++ b/Makefile
@@ -217,7 +217,7 @@ binary:
 	-e GOOS=${GOOS} -e GOARCH=${GOARCH} -e GOARM=6 -e CGO_ENABLED=1 \
 	-v /tmp/go-cache:/tmp/.cache/go-build -v /tmp/go-pkg:/go/pkg \
 	-w /go/src/storj.io/storj -e GOPROXY -u $(shell id -u):$(shell id -g) storjlabs/golang:${GO_VERSION} \
-	scripts/release.sh build -ldflags "-s -w" -o release/${TAG}/$(COMPONENT)_${GOOS}_${GOARCH}${FILEEXT} \
+	scripts/release.sh build -o release/${TAG}/$(COMPONENT)_${GOOS}_${GOARCH}${FILEEXT} \
 	storj.io/storj/cmd/${COMPONENT}
 	chmod 755 release/${TAG}/$(COMPONENT)_${GOOS}_${GOARCH}${FILEEXT}
 	[ "${FILEEXT}" = ".exe" ] && storj-sign release/${TAG}/$(COMPONENT)_${GOOS}_${GOARCH}${FILEEXT} || echo "Skipping signing"
diff --git a/scripts/release.sh b/scripts/release.sh
index 32f6eef2f..c7d2c1db7 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -28,7 +28,7 @@ fi
 
 echo Running "go $@"
 exec go "$1" -ldflags \
-	"-X storj.io/storj/internal/version.buildTimestamp=$TIMESTAMP
+	"-s -w -X storj.io/storj/internal/version.buildTimestamp=$TIMESTAMP
          -X storj.io/storj/internal/version.buildCommitHash=$COMMIT
          -X storj.io/storj/internal/version.buildVersion=$VERSION
          -X storj.io/storj/internal/version.buildRelease=$RELEASE" "${@:2}"