From 4692c48d8fa7fbf64262c5fb02919d75a1c1760b Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 16 Sep 2020 09:41:09 +0200
Subject: [PATCH] workaround to build probe-engine with go1.15 (#866)
---
build-cli.sh | 10 +++++++---
readme_compiletimecheck.go | 8 ++++++++
2 files changed, 15 insertions(+), 3 deletions(-)
create mode 100644 readme_compiletimecheck.go
diff --git a/build-cli.sh b/build-cli.sh
index 2be4202a..f46e10c6 100755
--- a/build-cli.sh
+++ b/build-cli.sh
@@ -1,15 +1,19 @@
#!/bin/sh
+set -e
+DISABLE_QUIC=""
+if [ ! -z "$(go version | grep go1.15)" ]; then DISABLE_QUIC="DISABLE_QUIC"; fi
+
set -ex
case $1 in
darwin)
export GOOS=darwin GOARCH=amd64
- go build -o ./CLI/darwin/amd64 -ldflags="-s -w" ./cmd/miniooni;;
+ go build -o ./CLI/darwin/amd64 -ldflags="-s -w" -tags $DISABLE_QUIC ./cmd/miniooni;;
linux)
export GOOS=linux GOARCH=amd64
- go build -o ./CLI/linux/amd64 -tags netgo -ldflags='-s -w -extldflags "-static"' ./cmd/miniooni;;
+ go build -o ./CLI/linux/amd64 -tags $DISABLE_QUIC,netgo -ldflags='-s -w -extldflags "-static"' ./cmd/miniooni;;
windows)
export GOOS=windows GOARCH=amd64
- go build -o ./CLI/windows/amd64 -ldflags="-s -w" ./cmd/miniooni;;
+ go build -o ./CLI/windows/amd64 -tags $DISABLE_QUIC -ldflags="-s -w" ./cmd/miniooni;;
*)
echo "usage: $0 darwin|linux|windows" 1>&2
exit 1
diff --git a/readme_compiletimecheck.go b/readme_compiletimecheck.go
new file mode 100644
index 00000000..30f7e359
--- /dev/null
+++ b/readme_compiletimecheck.go
@@ -0,0 +1,8 @@
+//+build !DISABLE_QUIC
+//+build go1.15
+
+package engine
+
+
+ATTENTION: If you are compiling probe-engine with go1.15 please make sure
+to pass -tags DISABLE_QUIC. Alternatively use the build script!
--
GitLab