From 42f83b3279bb4dd851883f843718787c79b89ef7 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 18 Oct 2019 14:56:18 +0200 Subject: build: update to go 1.13.3 and remove patcher Signed-off-by: Jason A. Donenfeld --- Makefile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 39d3046c..b7117fd3 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 -Wl,--tsaware 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 go.mod go.sum +SOURCE_FILES := $(call rwildcard,,*.go *.c *.h) go.mod go.sum RESOURCE_FILES := resources.rc version/version.h manifest.xml $(patsubst %.svg,%.ico,$(wildcard ui/icon/*.svg)) DEPLOYMENT_HOST ?= winvm @@ -15,14 +13,6 @@ DEPLOYMENT_PATH ?= Desktop all: amd64/wireguard.exe x86/wireguard.exe -.deps/prepared: export GOROOT := $(OLD_GOROOT) -.deps/prepared: $(wildcard golang-*.patch) - rm -rf .deps && mkdir -p .deps - if ! rsync --exclude=pkg/obj/go-build/trim.txt -aqL $$(go env GOROOT)/ .deps/goroot; then chmod -R +w .deps/goroot; exit 1; fi - chmod -R +w .deps/goroot - cat $^ | patch -f -N -r- -p1 -d .deps/goroot - touch $@ - %.ico: %.svg convert -background none $< -define icon:auto-resize="256,128,96,64,48,32,16" $@ -- cgit v1.2.3-59-g8ed1b