Skip to content

Commit

Permalink
Allow extra build args (#325)
Browse files Browse the repository at this point in the history
* Allow extra build args

* address review
  • Loading branch information
ofek authored and bjornleffler committed May 7, 2019
1 parent c37ff85 commit 77853e2
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions tools/build_gcsfuse/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,7 @@ import (
//
// version is the gcsfuse version being built (e.g. "0.11.1"), or a short git
// commit name if this is not for an official release.
func buildBinaries(
dstDir string,
srcDir string,
version string) (err error) {
func buildBinaries(dstDir, srcDir, version string, buildArgs []string) (err error) {
osys := runtime.GOOS
// Create the target structure.
{
Expand Down Expand Up @@ -142,6 +139,7 @@ func buildBinaries(
"-ldflags",
fmt.Sprintf("-X main.gcsfuseVersion=%s", version),
)
cmd.Args = append(cmd.Args, buildArgs...)
}

cmd.Args = append(cmd.Args, bin.goTarget)
Expand Down Expand Up @@ -214,17 +212,18 @@ func copyFile(dst string, src string, perm os.FileMode) (err error) {
func run() (err error) {
// Extract arguments.
args := flag.Args()
if len(args) != 3 {
err = fmt.Errorf("Usage: %s src_dir dst_dir version", os.Args[0])
if len(args) < 3 {
err = fmt.Errorf("Usage: %s src_dir dst_dir version [build args]", os.Args[0])
return
}

srcDir := args[0]
dstDir := args[1]
version := args[2]
buildArgs := args[3:]

// Build.
err = buildBinaries(dstDir, srcDir, version)
err = buildBinaries(dstDir, srcDir, version, buildArgs)
if err != nil {
err = fmt.Errorf("buildBinaries: %v", err)
return
Expand Down

0 comments on commit 77853e2

Please sign in to comment.