From a25486e4b16b5a97a9dff552359c0bf716114b32 Mon Sep 17 00:00:00 2001
From: Rob Pike <r@golang.org>
Date: Wed, 6 Mar 2013 13:16:43 -0800
Subject: [PATCH] make.bash,bat: add -tags gotypes to the build This installs
 type checking into go vet. (To be removed before releasing Go 1.1)

R=golang-dev, minux.ma
CC=golang-dev
https://golang.org/cl/7528044
---
 src/make.bash | 6 ++++--
 src/make.bat  | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/make.bash b/src/make.bash
index 2d83b6f4d1..a06964c3a2 100755
--- a/src/make.bash
+++ b/src/make.bash
@@ -134,13 +134,15 @@ echo
 
 if [ "$GOHOSTARCH" != "$GOARCH" -o "$GOHOSTOS" != "$GOOS" ]; then
 	echo "# Building packages and commands for host, $GOHOSTOS/$GOHOSTARCH."
+	# TODO: Drop the -tags gotypes before releasing Go 1.1. It is to allow type checking in go vet.
 	GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH \
-		"$GOTOOLDIR"/go_bootstrap install -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std
+		"$GOTOOLDIR"/go_bootstrap install -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -tags gotypes -v std
 	echo
 fi
 
 echo "# Building packages and commands for $GOOS/$GOARCH."
-"$GOTOOLDIR"/go_bootstrap install $GO_FLAGS -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std
+# TODO: Drop the -tags gotypes before releasing Go 1.1. It is to allow type checking in go vet.
+"$GOTOOLDIR"/go_bootstrap install $GO_FLAGS -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -tags gotypes -v std
 echo
 
 rm -f "$GOTOOLDIR"/go_bootstrap
diff --git a/src/make.bat b/src/make.bat
index be1c8f52dc..5caba73b17 100644
--- a/src/make.bat
+++ b/src/make.bat
@@ -90,14 +90,16 @@ echo # Building tools for local system. %GOHOSTOS%/%GOHOSTARCH%
 setlocal
 set GOOS=%GOHOSTOS%
 set GOARCH=%GOHOSTARCH%
-"%GOTOOLDIR%\go_bootstrap" install -gcflags "%GO_GCFLAGS%" -ldflags "%GO_LDFLAGS%" -v std
+:: TODO: Drop the -tags gotypes before releasing Go 1.1. It is to allow type checking in go vet.
+"%GOTOOLDIR%\go_bootstrap" install -gcflags "%GO_GCFLAGS%" -ldflags "%GO_LDFLAGS%" -tags gotypes -v std
 endlocal
 if errorlevel 1 goto fail
 echo.
 
 :mainbuild
 echo # Building packages and commands.
-"%GOTOOLDIR%\go_bootstrap" install -gcflags "%GO_GCFLAGS%" -ldflags "%GO_LDFLAGS%" -a -v std
+:: TODO: Drop the -tags gotypes before releasing Go 1.1. It is to allow type checking in go vet.
+"%GOTOOLDIR%\go_bootstrap" install -gcflags "%GO_GCFLAGS%" -ldflags "%GO_LDFLAGS%" -a -tags gotypes -v std
 if errorlevel 1 goto fail
 del "%GOTOOLDIR%\go_bootstrap.exe"
 echo.
-- 
2.48.1