diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-07-05 12:57:03 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-07-08 18:19:36 +0200 |
| commit | 5f02c206f499d3b44a78188769e9a64745d7575c (patch) | |
| tree | d93b1f8321b78d5b105cc3ea8a70d52e162903b3 | |
| parent | version: bump (diff) | |
| download | wireguard-windows-5f02c206f499d3b44a78188769e9a64745d7575c.tar.xz wireguard-windows-5f02c206f499d3b44a78188769e9a64745d7575c.zip | |
go: use 1.13beta1 for reproducable builds
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | build.bat | 5 |
2 files changed, 6 insertions, 4 deletions
@@ -1,8 +1,9 @@ -GOFLAGS := -ldflags="-H windowsgui -s -w" -v -tags walk_use_cgo +GOFLAGS := -ldflags="-H windowsgui -s -w" -v -tags walk_use_cgo -trimpath export CGO_ENABLED := 1 export CGO_CFLAGS := -O3 -Wall -Wno-unused-function -Wno-switch -std=gnu11 -DWINVER=0x0601 export CGO_LDFLAGS := -Wl,--major-os-version=6 -Wl,--minor-os-version=1 -Wl,--major-subsystem-version=6 -Wl,--minor-subsystem-version=1 export GOOS := windows +export GOPROXY := direct rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) SOURCE_FILES := $(call rwildcard,,*.go *.c *.h) @@ -22,7 +23,7 @@ resources_amd64.syso: $(RESOURCE_FILES) resources_386.syso: $(RESOURCE_FILES) i686-w64-mingw32-windres -i $< -o $@ -O coff -VERSIONCHECK := @[ "$$(go version | cut -d ' ' -f 3)" == go1.12.6 ] +VERSIONCHECK := @[ "$$(go version | cut -d ' ' -f 3)" == go1.13beta1 ] amd64/wireguard.exe: export CC := x86_64-w64-mingw32-gcc amd64/wireguard.exe: export GOARCH := amd64 @@ -12,7 +12,7 @@ if exist .deps\prepared goto :render rmdir /s /q .deps 2> NUL mkdir .deps || goto :error cd .deps || goto :error - call :download go.zip https://dl.google.com/go/go1.12.6.windows-amd64.zip 9badf7bbc0ed55f2db967434b033a2cddf2e46dbdc5bb8560d8fde019e8e19d3 || goto :error + call :download go.zip https://dl.google.com/go/go1.13beta1.windows-amd64.zip 08098b4b0e1a105971d2fced2842e806f8ffa08973ae8781fd22dd90f76404fb || goto :error rem Mirror of https://musl.cc/i686-w64-mingw32-native.zip call :download mingw-x86.zip https://download.wireguard.com/windows-toolchain/distfiles/i686-w64-mingw32-native-20190602.zip 003b7d07c837bfd365cf282772fb478bfd83195ee7f755d789420a6a651553a9 || goto :error rem Mirror of https://musl.cc/x86_64-w64-mingw32-native.zip @@ -32,6 +32,7 @@ if exist .deps\prepared goto :render :build set PATH=%STARTDIR%\.deps\go\bin\;%STARTDIR%\.deps\;%PATH% set GOOS=windows + set GOPROXY=direct set GOPATH=%STARTDIR%\.deps\gopath set GOROOT=%STARTDIR%\.deps\go set CGO_ENABLED=1 @@ -80,7 +81,7 @@ if exist .deps\prepared goto :render echo [+] Assembling resources %1 windres -i resources.rc -o resources.syso -O coff || exit /b %errorlevel% echo [+] Building program %1 - go build -ldflags="-H windowsgui -s -w" -tags walk_use_cgo -v -o "%~1\wireguard.exe" || exit /b 1 + go build -ldflags="-H windowsgui -s -w" -tags walk_use_cgo -trimpath -v -o "%~1\wireguard.exe" || exit /b 1 if not exist "%~1\wg.exe" ( echo [+] Building command line tools %1 del .deps\src\tools\*.exe .deps\src\tools\*.o .deps\src\tools\wincompat\*.o 2> NUL |