From 3d83df9bf3edcffcd5c2347323f70b9d12898a81 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 23 Dec 2020 17:49:36 +0100 Subject: [PATCH] memmod: apply explicit build tags to _32 and _64 files Since _32 and _64 aren't valid goarchs, they don't match _GOOS_GOARCH, and so the existing tags wind up not being restricted to windows-only. This fixes the problem by adding windows to the tags explicitly. We could also fix it by calling the files _32_windows or _64_windows, but that changes the convention with the other single-arch files. Signed-off-by: Jason A. Donenfeld --- tun/wintun/memmod/memmod_windows_32.go | 2 +- tun/wintun/memmod/memmod_windows_64.go | 2 +- tun/wintun/memmod/syscall_windows_32.go | 2 +- tun/wintun/memmod/syscall_windows_64.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tun/wintun/memmod/memmod_windows_32.go b/tun/wintun/memmod/memmod_windows_32.go index bd2e254..bb0f5e3 100644 --- a/tun/wintun/memmod/memmod_windows_32.go +++ b/tun/wintun/memmod/memmod_windows_32.go @@ -1,4 +1,4 @@ -// +build 386 arm +// +build windows,386 windows,arm /* SPDX-License-Identifier: MIT * diff --git a/tun/wintun/memmod/memmod_windows_64.go b/tun/wintun/memmod/memmod_windows_64.go index a66418f..43c0553 100644 --- a/tun/wintun/memmod/memmod_windows_64.go +++ b/tun/wintun/memmod/memmod_windows_64.go @@ -1,4 +1,4 @@ -// +build amd64 arm64 +// +build windows,amd64 windows,arm64 /* SPDX-License-Identifier: MIT * diff --git a/tun/wintun/memmod/syscall_windows_32.go b/tun/wintun/memmod/syscall_windows_32.go index 167d5fc..09407c7 100644 --- a/tun/wintun/memmod/syscall_windows_32.go +++ b/tun/wintun/memmod/syscall_windows_32.go @@ -1,4 +1,4 @@ -// +build 386 arm +// +build windows,386 windows,arm /* SPDX-License-Identifier: MIT * diff --git a/tun/wintun/memmod/syscall_windows_64.go b/tun/wintun/memmod/syscall_windows_64.go index 888acc4..14a8b08 100644 --- a/tun/wintun/memmod/syscall_windows_64.go +++ b/tun/wintun/memmod/syscall_windows_64.go @@ -1,4 +1,4 @@ -// +build amd64 arm64 +// +build windows,amd64 windows,arm64 /* SPDX-License-Identifier: MIT *