From 46560c3f3c0a091352115a3d825af45663b983d8 Mon Sep 17 00:00:00 2001
From: Alex Brainman <alex.brainman@gmail.com>
Date: Fri, 31 May 2019 06:47:26 +0000
Subject: [PATCH] Revert "windows: make zsyscall_windows.go generatable on
 non-WSL env"

This reverts commit ad28b68e88f12448a1685d038ffea87bbbb34148.

Reason for revert: It completely breaks 'go generate' on windows

Update golang/go#32349

Change-Id: I4bedc6cf5130eb48c18c3208c8029433407430e4
Reviewed-on: https://go-review.googlesource.com/c/sys/+/179580
Reviewed-by: Takuto Ikuta <tikuta@google.com>
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
---
 windows/generate.bash           | 15 ---------------
 windows/mkerrors.bash           |  2 +-
 windows/{gen.go => mkerrors.go} |  2 +-
 windows/mksyscall.go            |  9 +++++++++
 4 files changed, 11 insertions(+), 17 deletions(-)
 delete mode 100755 windows/generate.bash
 rename windows/{gen.go => mkerrors.go} (80%)
 create mode 100644 windows/mksyscall.go

diff --git a/windows/generate.bash b/windows/generate.bash
deleted file mode 100755
index 9916aa18..00000000
--- a/windows/generate.bash
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Copyright 2019 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-set -e
-
-# For successful zsyscall_windows.go generation on non-WSL env, this should
-# run before mkerrors.bash.
-echo "# Generating zsyscall_windows.go ..."
-go run $(go env GOROOT)/src/syscall/mksyscall_windows.go -output zsyscall_windows.go eventlog.go service.go syscall_windows.go security_windows.go
-
-echo "# Generating zerrors_windows.go ..."
-./mkerrors.bash zerrors_windows.go
diff --git a/windows/mkerrors.bash b/windows/mkerrors.bash
index 8e59e93f..a70b24f3 100755
--- a/windows/mkerrors.bash
+++ b/windows/mkerrors.bash
@@ -9,7 +9,7 @@ shopt -s nullglob
 
 [[ $# -eq 1 ]] || { echo "Usage: $0 OUTPUT_FILE.go" >&2; exit 1; }
 winerror="$(printf '%s\n' "/mnt/c/Program Files (x86)/Windows Kits/"/*/Include/*/shared/winerror.h | sort -Vr | head -n 1)"
-[[ -n $winerror ]] || { echo "Unable to find winerror.h; this expects to be run on Windows with WSL" >&2; exit 1; }
+[[ -n $winerror ]] || { echo "Unable to find winerror.h" >&2; exit 1; }
 
 declare -A errors
 
diff --git a/windows/gen.go b/windows/mkerrors.go
similarity index 80%
rename from windows/gen.go
rename to windows/mkerrors.go
index d08e2779..a204e6ca 100644
--- a/windows/gen.go
+++ b/windows/mkerrors.go
@@ -6,4 +6,4 @@
 
 package windows
 
-//go:generate ./generate.bash
+//go:generate ./mkerrors.bash zerrors_windows.go
diff --git a/windows/mksyscall.go b/windows/mksyscall.go
new file mode 100644
index 00000000..62770572
--- /dev/null
+++ b/windows/mksyscall.go
@@ -0,0 +1,9 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build generate
+
+package windows
+
+//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go eventlog.go service.go syscall_windows.go security_windows.go