adding gocmd flag to more easily test against go1.8beta2 and future builds

1 files changed, 11 insertions, 4 deletions

diff --git a/cmd/ponzu/options.go b/cmd/ponzu/options.go
index 7e37255..1316a67 100644
--- a/cmd/ponzu/options.go
+++ b/cmd/ponzu/options.go
@@ -271,10 +271,17 @@ func buildPonzuServer(args []string) error {
 	}
 
 	// execute go build -o ponzu-cms cmd/ponzu/*.go
-	mainPath := filepath.Join(pwd, "cmd", "ponzu", "main.go")
-	optsPath := filepath.Join(pwd, "cmd", "ponzu", "options.go")
-	genPath := filepath.Join(pwd, "cmd", "ponzu", "generate.go")
-	build := exec.Command("go", "build", "-o", "ponzu-server", mainPath, optsPath, genPath)
+	buildOptions := []string{"build", "-o", "ponzu-server"}
+	cmdBuildFiles := []string{"main.go", "options.go", "generate.go", "usage.go"}
+	var cmdBuildFilePaths []string
+	for _, file := range cmdBuildFiles {
+		p := filepath.Join(pwd, "cmd", "ponzu", file)
+		cmdBuildFilePaths = append(cmdBuildFilePaths, p)
+	}
+	// mainPath := filepath.Join(pwd, "cmd", "ponzu", "main.go")
+	// optsPath := filepath.Join(pwd, "cmd", "ponzu", "options.go")
+	// genPath := filepath.Join(pwd, "cmd", "ponzu", "generate.go")
+	build := exec.Command(gocmd, append(buildOptions, cmdBuildFilePaths...)...)
 	build.Stderr = os.Stderr
 	build.Stdout = os.Stdout