opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-03 01:22:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix backend build on Windows (#28557)

Browse Source 
* Fix backend build on Windows

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix remaining build.go issues on Windows

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2020-10-27 13:57:12 +01:00
committed by GitHub
parent b3ac4eb899
commit aa9134b3b4
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build.go
View File

@ -451,7 +451,12 @@ func gruntBuildArg(task string) []string {
} }
func setup() { func setup() {
runPrint("go", "install", "-v", "./pkg/cmd/grafana-server") args := []string{"install", "-v"}
if goos == windows {
args = append(args, "-buildmode=exe")
}
args = append(args, "./pkg/cmd/grafana-server")
runPrint("go", args...)
} }
func printGeneratedVersion() { func printGeneratedVersion() {
@ -460,7 +465,12 @@ func printGeneratedVersion() {
func test(pkg string) { func test(pkg string) {
setBuildEnv() setBuildEnv()
runPrint("go", "test", "-short", "-timeout", "60s", pkg) args := []string{"test", "-short", "-timeout", "60s"}
if goos == windows {
args = append(args, "-buildmode=exe")
}
args = append(args, pkg)
runPrint("go", args...)
} }
func doBuild(binaryName, pkg string, tags []string) { func doBuild(binaryName, pkg string, tags []string) {
@ -482,6 +492,10 @@ func doBuild(binaryName, pkg string, tags []string) {
rmr(binary, binary+".md5") rmr(binary, binary+".md5")
} }
args := []string{"build", "-ldflags", ldflags()} args := []string{"build", "-ldflags", ldflags()}
if goos == windows {
// Work around a linking error on Windows: "export ordinal too large"
args = append(args, "-buildmode=exe")
}
if len(tags) > 0 { if len(tags) > 0 {
args = append(args, "-tags", strings.Join(tags, ",")) args = append(args, "-tags", strings.Join(tags, ","))
} }