From dc365bca4448961d2c0bbda849304397619f77ff Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Mon, 24 Apr 2017 23:01:38 -0700 Subject: [PATCH] build: -s -w should be added by gen-ldflags.go (#4172) --- Makefile | 2 +- buildscripts/gen-ldflags.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index eed35762e..e4998ae69 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ LDFLAGS := $(shell go run buildscripts/gen-ldflags.go) PWD := $(shell pwd) GOPATH := $(shell go env GOPATH) -BUILD_LDFLAGS := '$(LDFLAGS) -s -w' +BUILD_LDFLAGS := '$(LDFLAGS)' TAG := latest HOST ?= $(shell uname) diff --git a/buildscripts/gen-ldflags.go b/buildscripts/gen-ldflags.go index 24a530e3b..6ea04b742 100644 --- a/buildscripts/gen-ldflags.go +++ b/buildscripts/gen-ldflags.go @@ -27,8 +27,8 @@ import ( ) func genLDFlags(version string) string { - var ldflagsStr string - ldflagsStr = "-X github.com/minio/minio/cmd.Version=" + version + ldflagsStr := "-s -w" + ldflagsStr += " -X github.com/minio/minio/cmd.Version=" + version ldflagsStr += " -X github.com/minio/minio/cmd.ReleaseTag=" + releaseTag(version) ldflagsStr += " -X github.com/minio/minio/cmd.CommitID=" + commitID() ldflagsStr += " -X github.com/minio/minio/cmd.ShortCommitID=" + commitID()[:12]