perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM builds in build.go

Browse Source
This commit is contained in:
Jakob Borg 2014-08-18 21:53:08 +02:00
parent 4f92482294
commit 045916efcc
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build.go
View File

@ -140,6 +140,7 @@ func build(pkg string, tags []string) {
args = append(args, "-tags", strings.Join(tags, ",")) args = append(args, "-tags", strings.Join(tags, ","))
} }
args = append(args, pkg) args = append(args, pkg)
setBuildEnv()
runPrint("godep", args...) runPrint("godep", args...)
} }
@ -150,9 +151,6 @@ func buildTar() {
tags = []string{"noupgrade"} tags = []string{"noupgrade"}
name += "-noupgrade" name += "-noupgrade"
} }
os.Setenv("GOOS", goos)
os.Setenv("GOARCH", goarch)
build("./cmd/syncthing", tags) build("./cmd/syncthing", tags)
filename := name + ".tar.gz" filename := name + ".tar.gz"
tarGz(filename, []archiveFile{ tarGz(filename, []archiveFile{
@ -171,8 +169,6 @@ func buildZip() {
tags = []string{"noupgrade"} tags = []string{"noupgrade"}
name += "-noupgrade" name += "-noupgrade"
} }
os.Setenv("GOOS", goos)
os.Setenv("GOARCH", goarch)
build("./cmd/syncthing", tags) build("./cmd/syncthing", tags)
filename := name + ".zip" filename := name + ".zip"
zipFile(filename, []archiveFile{ zipFile(filename, []archiveFile{
@ -184,6 +180,15 @@ func buildZip() {
log.Println(filename) log.Println(filename)
} }
func setBuildEnv() {
os.Setenv("GOOS", goos)
if strings.HasPrefix(goarch, "arm") {
os.Setenv("GOARCH", "arm")
} else {
os.Setenv("GOARCH", goarch)
}
}
func assets() { func assets() {
runPipe("auto/gui.files.go", "godep", "go", "run", "cmd/genassets/main.go", "gui") runPipe("auto/gui.files.go", "godep", "go", "run", "cmd/genassets/main.go", "gui")
} }
@ -230,6 +235,9 @@ func ldflags() string {
b.WriteString(fmt.Sprintf(" -X main.BuildUser %s", buildUser())) b.WriteString(fmt.Sprintf(" -X main.BuildUser %s", buildUser()))
b.WriteString(fmt.Sprintf(" -X main.BuildHost %s", buildHost())) b.WriteString(fmt.Sprintf(" -X main.BuildHost %s", buildHost()))
b.WriteString(fmt.Sprintf(" -X main.BuildEnv %s", buildEnvironment())) b.WriteString(fmt.Sprintf(" -X main.BuildEnv %s", buildEnvironment()))
if strings.HasPrefix(goarch, "arm") {
b.WriteString(fmt.Sprintf(" -X main.GoArchExtra %s", goarch[3:]))
}
return b.String() return b.String()
} }