diff --git a/appveyor.yml b/appveyor.yml index 0cfe8c4171..6fb39b44e2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,6 +6,7 @@ environment: - QT: C:\Qt\5.15.2\msvc2019_64 GOROOT: C:\go GOPATH: C:\gopath\ + GOTOOLCHAIN: local PLATFORM: amd64 COMPILER: msvc diff --git a/frontends/qt/server/Makefile.linux b/frontends/qt/server/Makefile.linux index 322f290561..14a0004717 100644 --- a/frontends/qt/server/Makefile.linux +++ b/frontends/qt/server/Makefile.linux @@ -4,12 +4,13 @@ CGO=1 BUILDMODE=c-shared GOARCH=amd64 GOOS=linux +GOTOOLCHAIN=local linux: CC=clang \ CGO_CFLAGS="${GOLNXSECFLAGS} ${CFLAGS}" \ CGO_LDFLAGS="${GOLNXLDFLAGS} ${LFLAGS}" \ - GOARCH=${GOARCH} CGO_ENABLED=${CGO} GOOS=${GOOS} \ + GOARCH=${GOARCH} CGO_ENABLED=${CGO} GOOS=${GOOS} GOTOOLCHAIN=${GOTOOLCHAIN} \ go build -x -mod=vendor -buildmode=${BUILDMODE} -ldflags \ -extldflags="${GOLNXEXTLDFLAGS}" -o ${LIBNAME}.so diff --git a/frontends/qt/server/Makefile.macosx b/frontends/qt/server/Makefile.macosx index 6916c8f72b..3a3920be87 100644 --- a/frontends/qt/server/Makefile.macosx +++ b/frontends/qt/server/Makefile.macosx @@ -4,12 +4,13 @@ CGO=1 BUILDMODE=c-shared GOARCH=amd64 GOOS=darwin +GOTOOLCHAIN=local darwin: CGO_CFLAGS="-g ${GODARWINSECFLAGS} ${CFLAGS}" \ CGO_LDFLAGS="${GODARWINLDFLAGS} ${LFLAGS}" \ MACOSX_DEPLOYMENT_TARGET=${MACOS_MIN_VERSION} \ - GOARCH=${GOARCH} CGO_ENABLED=${CGO} GOOS=${GOOS} \ + GOARCH=${GOARCH} CGO_ENABLED=${CGO} GOOS=${GOOS} GOTOOLCHAIN=${GOTOOLCHAIN} \ go build -ldflags='-s' -x -mod=vendor \ -buildmode="c-shared" -o ${LIBNAME}.so diff --git a/frontends/qt/server/Makefile.windows b/frontends/qt/server/Makefile.windows index 087b199ec9..6cb0728cfc 100644 --- a/frontends/qt/server/Makefile.windows +++ b/frontends/qt/server/Makefile.windows @@ -4,11 +4,12 @@ CGO=1 BUILDMODE=c-shared GOARCH=amd64 GOOS=windows +GOTOOLCHAIN=local windows: CGO_CFLAGS="${GOWINSECFLAGS} ${CFLAGS}" \ CGO_LDFLAGS="${GOWINLDFLAGS} ${LFLAGS}" \ - GOARCH=${GOARCH} CGO_ENABLED=${CGO} GOOS=${GOOS} \ + GOARCH=${GOARCH} CGO_ENABLED=${CGO} GOOS=${GOOS} GOTOOLCHAIN=${GOTOOLCHAIN} \ go build -x -mod=vendor \ -buildmode="${BUILDMODE}" -o ${LIBNAME}.dll @@ -17,7 +18,7 @@ windows-cross: CC_FOR_TARGET=/usr/bin/x86_64-w64-mingw32-gcc \ CGO_CFLAGS="-g ${GOWINSECFLAGS} ${CFLAGS}" \ CGO_LDFLAGS="${GOWINLDFLAGS} ${LFLAGS}" \ - GOARCH=${GOARCH} CGO_ENABLED=${CGO} GOOS=${GOOS} \ + GOARCH=${GOARCH} CGO_ENABLED=${CGO} GOOS=${GOOS} GOTOOLCHAIN=${GOTOOLCHAIN} \ go build -x -mod=vendor \ -buildmode="${BUILDMODE}" -o ${LIBNAME}.dll diff --git a/scripts/ci.sh b/scripts/ci.sh index adb19258ed..7888dcb9c9 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -19,6 +19,7 @@ set -x # Set go-langs data race detector options export GORACE="halt_on_error=1" +export GOTOOLCHAIN="local" # This script has to be called from the project root directory. go build -mod=vendor ./...