From 87cb1e65c80f62cf0a56c1bf99d8c1258d84aaa5 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sun, 17 Jan 2021 05:07:17 -0500
Subject: [PATCH 7/7] Add support for Go 1.16.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
builder/config.go | 4 ++--
cgo/testdata/errors.out.go | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builder/config.go b/builder/config.go
index 9564386..b145ec5 100644
--- 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 > 15 {
- return nil, fmt.Errorf("requires go version 1.11 through 1.15, got go%d.%d", major, minor)
+ if major != 1 || minor < 11 || minor > 16 {
+ return nil, fmt.Errorf("requires go version 1.11 through 1.16, got go%d.%d", major, minor)
}
clangHeaderPath := getClangHeaderPath(goenv.Get("TINYGOROOT"))
return &compileopts.Config{
diff --git a/cgo/testdata/errors.out.go b/cgo/testdata/errors.out.go
index ace2390..b5d6978 100644
--- a/cgo/testdata/errors.out.go
+++ b/cgo/testdata/errors.out.go
@@ -4,10 +4,10 @@
// testdata/errors.go:13:23: unexpected token )
// Type checking errors after CGo processing:
-// testdata/errors.go:102: 2 << 10 (untyped int constant 2048) overflows uint8
+// testdata/errors.go:102: cannot use 2 << 10 (untyped int constant 2048) as uint8 value in variable declaration (overflows)
// testdata/errors.go:105: unknown field z in struct literal
// testdata/errors.go:108: undeclared name: C.SOME_CONST_1
-// testdata/errors.go:110: C.SOME_CONST_3 (untyped int constant 1234) overflows byte
+// testdata/errors.go:110: cannot use C.SOME_CONST_3 (untyped int constant 1234) as byte value in variable declaration (overflows)
package main
--
2.29.2