From 8a410b993b005e8b1868409ecb49a7c0882e75ac Mon Sep 17 00:00:00 2001
From: deadprogram <ron@hybridgroup.com>
Date: Mon, 17 Aug 2020 15:26:18 +0200
Subject: [PATCH] make,builder: incorporate feedback from code review on Go
 1.15 update

Signed-off-by: deadprogram <ron@hybridgroup.com>
---
 Makefile          | 2 +-
 builder/config.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6d13912d..425a0cfc 100644
--- a/Makefile
+++ b/Makefile
@@ -346,7 +346,7 @@ endif
 	@$(MD5SUM) test.elf
 
 wasmtest:
-	$(GO) test -buildmode exe ./tests/wasm
+	$(GO) test ./tests/wasm
 
 build/release: tinygo gen-device wasi-libc
 	@mkdir -p build/release/tinygo/bin
diff --git a/builder/config.go b/builder/config.go
index b3df6efb..95643866 100644
--- a/builder/config.go
+++ b/builder/config.go
@@ -26,7 +26,7 @@ func NewConfig(options *compileopts.Options) (*compileopts.Config, error) {
 		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 thru 1.15, got go%d.%d", major, minor)
+		return nil, fmt.Errorf("requires go version 1.11 through 1.15, got go%d.%d", major, minor)
 	}
 	clangHeaderPath := getClangHeaderPath(goenv.Get("TINYGOROOT"))
 	return &compileopts.Config{