Use the 'purego' build tag, for cznic/zappy.

Change-Id: I23ef7e3f269fd884f77e61276468e023697d4580
This commit is contained in:
Brad Fitzpatrick 2014-08-23 20:11:50 -07:00
parent 8bbd38f2dd
commit 8cf6ab92cf
2 changed files with 7 additions and 5 deletions

View File

@ -38,7 +38,7 @@ USER camli
ENV GOPATH /gopath ENV GOPATH /gopath
RUN go install \ RUN go install --tags=purego \
camlistore.org/server/camlistored \ camlistore.org/server/camlistored \
camlistore.org/cmd/camput \ camlistore.org/cmd/camput \
camlistore.org/cmd/camget \ camlistore.org/cmd/camget \

10
make.go
View File

@ -172,9 +172,9 @@ func main() {
deleteUnwantedOldMirrorFiles(buildSrcDir, withCamlistored) deleteUnwantedOldMirrorFiles(buildSrcDir, withCamlistored)
} }
tags := "" tags := []string{"purego"} // for cznic/zappy
if sql { if sql {
tags = "with_sqlite" tags = append(tags, "with_sqlite")
} }
baseArgs := []string{"install", "-v"} baseArgs := []string{"install", "-v"}
if *all { if *all {
@ -185,10 +185,12 @@ func main() {
} }
ldFlags := "-X camlistore.org/pkg/buildinfo.GitInfo " + version ldFlags := "-X camlistore.org/pkg/buildinfo.GitInfo " + version
if *dockerMode { if *dockerMode {
tags = "netgo" // Use libc-free net package for a static binary.
// And -w appears to be required too.
tags = append(tags, "netgo")
ldFlags = "-w " + ldFlags ldFlags = "-w " + ldFlags
} }
baseArgs = append(baseArgs, "--ldflags="+ldFlags, "--tags="+tags) baseArgs = append(baseArgs, "--ldflags="+ldFlags, "--tags="+strings.Join(tags, ","))
// First install command: build just the final binaries, installed to a GOBIN // First install command: build just the final binaries, installed to a GOBIN
// under <camlistore_root>/bin: // under <camlistore_root>/bin: