From 0e6d8d56a2149bb123f80b1968fc2be9645152d6 Mon Sep 17 00:00:00 2001 From: Jeevanandam M Date: Thu, 21 Jul 2016 17:22:15 -0700 Subject: [PATCH] ldflags issue commit, read more... This commit is address 1.7 release. RC3 is already out there. It may lead to merge conflict while merging develop branch. Since enhancements are done. --- harness/build.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/harness/build.go b/harness/build.go index d1e21b6..c98b8c9 100755 --- a/harness/build.go +++ b/harness/build.go @@ -77,7 +77,13 @@ func Build(buildFlags ...string) (app *App, compileError *revel.Error) { gotten := make(map[string]struct{}) for { appVersion := getAppVersion() - versionLinkerFlags := fmt.Sprintf("-X %s/app.APP_VERSION \"%s\"", revel.ImportPath, appVersion) + versionLinkerFlags := fmt.Sprintf("-X %s/app.APP_VERSION=%s", revel.ImportPath, appVersion) + + // TODO remove version check for versionLinkerFlags after Revel becomes Go min version to go1.5 + goVersion, _ := strconv.ParseFloat(runtime.Version()[2:5], 64) + if goVersion < 1.5 { + versionLinkerFlags = fmt.Sprintf("-X %s/app.APP_VERSION \"%s\"", revel.ImportPath, appVersion) + } flags := []string{ "build", "-i",