Pull request 2029: 6247-amd64-levels

Updates #6247.

Squashed commit of the following:

commit 81bcde806688cb1d8991d1e6069c1a8d5c1ed21b
Merge: 5c60b76a6 8842b2df9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Oct 9 13:17:27 2023 +0300

    Merge branch 'master' into 6247-amd64-levels

commit 5c60b76a6005dd4ef95969d1cde0c94ac24b8f66
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Oct 6 19:20:46 2023 +0300

    scripts: upd docs

commit 2808203f1ad02adbe936ee6d5712a922b3c7840c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Oct 6 17:55:43 2023 +0300

    all: add goamd64
This commit is contained in:
Stanislav Chzhen 2023-10-09 13:24:52 +03:00
parent 8842b2df90
commit 24e0e33bb6
2 changed files with 7 additions and 1 deletions

View File

@ -24,6 +24,7 @@ CHANNEL = development
CLIENT_DIR = client CLIENT_DIR = client
COMMIT = $$( git rev-parse --short HEAD ) COMMIT = $$( git rev-parse --short HEAD )
DIST_DIR = dist DIST_DIR = dist
GOAMD64 = v1
GOPROXY = https://goproxy.cn|https://proxy.golang.org|direct GOPROXY = https://goproxy.cn|https://proxy.golang.org|direct
GOSUMDB = sum.golang.google.cn GOSUMDB = sum.golang.google.cn
GPG_KEY = devteam@adguard.com GPG_KEY = devteam@adguard.com
@ -61,6 +62,7 @@ ENV = env\
GPG_KEY_PASSPHRASE='$(GPG_KEY_PASSPHRASE)'\ GPG_KEY_PASSPHRASE='$(GPG_KEY_PASSPHRASE)'\
DIST_DIR='$(DIST_DIR)'\ DIST_DIR='$(DIST_DIR)'\
GO="$(GO.MACRO)"\ GO="$(GO.MACRO)"\
GOAMD64="$(GOAMD64)"\
GOPROXY='$(GOPROXY)'\ GOPROXY='$(GOPROXY)'\
GOSUMDB='$(GOSUMDB)'\ GOSUMDB='$(GOSUMDB)'\
PATH="$${PWD}/bin:$$( "$(GO.MACRO)" env GOPATH )/bin:$${PATH}"\ PATH="$${PWD}/bin:$$( "$(GO.MACRO)" env GOPATH )/bin:$${PATH}"\

View File

@ -120,6 +120,9 @@ Optional environment:
Optional environment: Optional environment:
* `GOAMD64`: architectural level for [AMD64][amd64]. The default value is
`v1`.
* `GOARM`: ARM processor options for the Go compiler. * `GOARM`: ARM processor options for the Go compiler.
* `GOMIPS`: ARM processor options for the Go compiler. * `GOMIPS`: ARM processor options for the Go compiler.
@ -146,6 +149,7 @@ Required environment:
* `CHANNEL`: release channel, see above. * `CHANNEL`: release channel, see above.
[amd64]: https://github.com/golang/go/wiki/MinimumRequirements#amd64
[repr]: https://reproducible-builds.org/docs/source-date-epoch/ [repr]: https://reproducible-builds.org/docs/source-date-epoch/