Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "make.go: copy the correct binary when cross-compiling camlistored for docker"

This commit is contained in:
Mathieu Lonjaret 2014-11-11 21:04:45 +00:00 committed by Gerrit Code Review
parent 9990b79616 d35ac9981c
commit bb4ca559e4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
make.go
View File

@ -216,10 +216,7 @@ func main() {
"GOPATH="+buildGoPath,
)
if *dockerMode {
cmd.Env = append(cmd.Env,
"GOBIN="+filepath.Join(camRoot, "misc", "docker", "camlistored"),
"CGO_ENABLED=0",
)
cmd.Env = append(cmd.Env, "CGO_ENABLED=0")
}
var output bytes.Buffer
if *quiet {
@ -236,6 +233,12 @@ func main() {
log.Fatalf("Error building main binaries: %v\n%s", err, output.String())
}
if *dockerMode {
// See comment below.
src := filepath.Join(actualBinDir(filepath.Join(buildGoPath, "bin")), "camlistored")
dst := filepath.Join(camRoot, "misc", "docker", "camlistored", "camlistored")
if err := mirrorFile(src, dst); err != nil {
log.Fatalf("Error copying %s to %s: %v", src, dst, err)
}
log.Printf("Wrote docker camlistored binary to misc/docker/camlistored")
return
}