From 24e0e33bb61f25b5a1d8058cf3a16ddb41889327 Mon Sep 17 00:00:00 2001 From: Stanislav Chzhen Date: Mon, 9 Oct 2023 13:24:52 +0300 Subject: [PATCH] Pull request 2029: 6247-amd64-levels Updates #6247. Squashed commit of the following: commit 81bcde806688cb1d8991d1e6069c1a8d5c1ed21b Merge: 5c60b76a6 8842b2df9 Author: Stanislav Chzhen Date: Mon Oct 9 13:17:27 2023 +0300 Merge branch 'master' into 6247-amd64-levels commit 5c60b76a6005dd4ef95969d1cde0c94ac24b8f66 Author: Stanislav Chzhen Date: Fri Oct 6 19:20:46 2023 +0300 scripts: upd docs commit 2808203f1ad02adbe936ee6d5712a922b3c7840c Author: Stanislav Chzhen Date: Fri Oct 6 17:55:43 2023 +0300 all: add goamd64 --- Makefile | 2 ++ scripts/README.md | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9c8913ea..b40b4cd0 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ CHANNEL = development CLIENT_DIR = client COMMIT = $$( git rev-parse --short HEAD ) DIST_DIR = dist +GOAMD64 = v1 GOPROXY = https://goproxy.cn|https://proxy.golang.org|direct GOSUMDB = sum.golang.google.cn GPG_KEY = devteam@adguard.com @@ -61,6 +62,7 @@ ENV = env\ GPG_KEY_PASSPHRASE='$(GPG_KEY_PASSPHRASE)'\ DIST_DIR='$(DIST_DIR)'\ GO="$(GO.MACRO)"\ + GOAMD64="$(GOAMD64)"\ GOPROXY='$(GOPROXY)'\ GOSUMDB='$(GOSUMDB)'\ PATH="$${PWD}/bin:$$( "$(GO.MACRO)" env GOPATH )/bin:$${PATH}"\ diff --git a/scripts/README.md b/scripts/README.md index 5ce27e80..b567cbd4 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -120,6 +120,9 @@ Optional environment: Optional environment: + * `GOAMD64`: architectural level for [AMD64][amd64]. The default value is + `v1`. + * `GOARM`: ARM processor options for the Go compiler. * `GOMIPS`: ARM processor options for the Go compiler. @@ -146,7 +149,8 @@ Required environment: * `CHANNEL`: release channel, see above. -[repr]: https://reproducible-builds.org/docs/source-date-epoch/ +[amd64]: https://github.com/golang/go/wiki/MinimumRequirements#amd64 +[repr]: https://reproducible-builds.org/docs/source-date-epoch/