From f0a2bb02957ed2ae147263e3867f12a2708ad3aa Mon Sep 17 00:00:00 2001 From: Russ Magee Date: Wed, 3 Jun 2020 21:39:42 -0700 Subject: [PATCH] Updates to fix MSYSTEM=MSYS build and install targets Signed-off-by: Russ Magee --- Makefile | 3 ++- go.mod | 3 +-- go.sum | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 091d6a6..bbd5490 100644 --- a/Makefile +++ b/Makefile @@ -72,8 +72,9 @@ client: common server: common -ifdef WIN_MSYS +ifeq ($(MSYSTEM),MSYS) echo "Build of xsd server for Windows not yet supported" +else $(MAKE) BUILDOPTS=$(BUILDOPTS) -C xsd endif diff --git a/go.mod b/go.mod index 6cf9e07..090570b 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,7 @@ require ( blitter.com/go/newhope v0.0.0-20200130200750-192fc08a8aae github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da github.com/jameskeane/bcrypt v0.0.0-20120420032655-c3cd44c1e20f - github.com/klauspost/cpuid v1.2.3 // indirect - github.com/klauspost/reedsolomon v1.9.4 // indirect + github.com/klauspost/reedsolomon v1.9.9 // indirect github.com/kr/pty v1.1.8 github.com/mattn/go-isatty v0.0.12 github.com/pkg/errors v0.9.1 // indirect diff --git a/go.sum b/go.sum index f04a5aa..0592509 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,12 @@ github.com/jameskeane/bcrypt v0.0.0-20120420032655-c3cd44c1e20f h1:UWGE8Vi+1Agt0 github.com/jameskeane/bcrypt v0.0.0-20120420032655-c3cd44c1e20f/go.mod h1:u+9Snq0w+ZdYKi8BBoaxnEwWu0fY4Kvu9ByFpM51t1s= github.com/klauspost/cpuid v1.2.3 h1:CCtW0xUnWGVINKvE/WWOYKdsPV6mawAtvQuSl8guwQs= github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/klauspost/cpuid v1.2.4 h1:EBfaK0SWSwk+fgk6efYFWdzl8MwRWoOO1gkmiaTXPW4= +github.com/klauspost/cpuid v1.2.4/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/reedsolomon v1.9.4 h1:FB9jDBGqUNyhUg4Gszz384ulFqVSc61Pdap+HRPgnSo= github.com/klauspost/reedsolomon v1.9.4/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4= +github.com/klauspost/reedsolomon v1.9.9 h1:qCL7LZlv17xMixl55nq2/Oa1Y86nfO8EqDfv2GHND54= +github.com/klauspost/reedsolomon v1.9.9/go.mod h1:O7yFFHiQwDR6b2t63KPUpccPtNdp5ADgh1gg4fd12wo= github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=