From 5b7309a2aa9f00d919a5d66ed8b64fa5a24e9271 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 14 Jun 2019 17:47:09 +0200 Subject: build: bump to go 1.12.6 --- Makefile | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index eb50bc37..5220a93a 100644 --- a/Makefile +++ b/Makefile @@ -3,11 +3,9 @@ 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 -OLD_GOROOT := $(GOROOT) -export GOROOT := $(CURDIR)/.deps/goroot rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) -SOURCE_FILES := $(call rwildcard,,*.go *.c *.h) .deps/prepared +SOURCE_FILES := $(call rwildcard,,*.go *.c *.h) RESOURCE_FILES := resources.rc version.h manifest.xml $(patsubst %.svg,%.ico,$(wildcard ui/icon/*.svg)) DEPLOYMENT_HOST ?= winvm @@ -18,27 +16,24 @@ all: amd64/wireguard.exe x86/wireguard.exe %.ico: %.svg convert -background none $< -define icon:auto-resize="256,128,96,64,48,32,16" $@ -.deps/prepared: export GOROOT := $(OLD_GOROOT) -.deps/prepared: $(wildcard golang-*.patch) - rm -rf .deps && mkdir -p .deps - rsync --exclude=pkg/obj/go-build/trim.txt -aq $$(go env GOROOT)/ .deps/goroot - cat $^ | patch -f -N -r- -p1 -d .deps/goroot - touch $@ - resources_amd64.syso: $(RESOURCE_FILES) x86_64-w64-mingw32-windres -i $< -o $@ -O coff resources_386.syso: $(RESOURCE_FILES) i686-w64-mingw32-windres -i $< -o $@ -O coff +VERSIONCHECK := @[ "$$(go version | cut -d ' ' -f 3)" == go1.12.6 ] + amd64/wireguard.exe: export CC := x86_64-w64-mingw32-gcc amd64/wireguard.exe: export GOARCH := amd64 amd64/wireguard.exe: resources_amd64.syso $(SOURCE_FILES) + $(VERSIONCHECK) go build $(GOFLAGS) -o $@ x86/wireguard.exe: export CC := i686-w64-mingw32-gcc x86/wireguard.exe: export GOARCH := 386 x86/wireguard.exe: resources_386.syso $(SOURCE_FILES) + $(VERSIONCHECK) go build $(GOFLAGS) -o $@ fmt: export CC := i686-w64-mingw32-gcc -- cgit v1.2.3-59-g8ed1b