builder: allow Go 1.15 to pass config check

deadprogram · deadprogram · commit 29f599b56d0c · 2020-08-14T20:19:39.000+02:00
Signed-off-by: deadprogram &lt;ron@hybridgroup.com&gt;
diff --git a/builder/config.go b/builder/config.go
@@ -25,8 +25,8 @@ func NewConfig(options *compileopts.Options) (*compileopts.Config, error) {
 	if err != nil {
 		return nil, fmt.Errorf("could not read version from GOROOT (%v): %v", goroot, err)
 	}
-	if major != 1 || minor < 11 || minor > 14 {
-		return nil, fmt.Errorf("requires go version 1.11, 1.12, 1.13, or 1.14, got go%d.%d", major, minor)
+	if major != 1 || minor < 11 || minor > 15 {
+		return nil, fmt.Errorf("requires go version 1.11, 1.12, 1.13, 1.14, or 1.15, got go%d.%d", major, minor)
 	}
 	clangHeaderPath := getClangHeaderPath(goenv.Get("TINYGOROOT"))
 	return &compileopts.Config{

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ func NewConfig(options compileopts.Options) (compileopts.Config, error) {`
`25`	`25`	`if err != nil {`
`26`	`26`	`return nil, fmt.Errorf("could not read version from GOROOT (%v): %v", goroot, err)`
`27`	`27`	`}`
`28`		`- if major != 1 \|\| minor < 11 \|\| minor > 14 {`
`29`		`- return nil, fmt.Errorf("requires go version 1.11, 1.12, 1.13, or 1.14, got go%d.%d", major, minor)`
	`28`	`+ if major != 1 \|\| minor < 11 \|\| minor > 15 {`
	`29`	`+ return nil, fmt.Errorf("requires go version 1.11, 1.12, 1.13, 1.14, or 1.15, got go%d.%d", major, minor)`
`30`	`30`	`}`
`31`	`31`	`clangHeaderPath := getClangHeaderPath(goenv.Get("TINYGOROOT"))`
`32`	`32`	`return &compileopts.Config{`