diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-13 06:15:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-13 06:15:43 +0000 |
| commit | 4a60d08bd5debb3678e939988633a2ba04a758c7 (patch) | |
| tree | c1907cd486fc361cf11fafe8ca7de29fe65ab99a /workhorse | |
| parent | b9abe8515111c39c65321258d760aaf4773cb55f (diff) | |
| download | gitlab-ce-4a60d08bd5debb3678e939988633a2ba04a758c7.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse')
| -rw-r--r-- | workhorse/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/workhorse/Makefile b/workhorse/Makefile index 4236a1a0d8e..ba99276d1be 100644 --- a/workhorse/Makefile +++ b/workhorse/Makefile @@ -27,6 +27,12 @@ ifeq (${FIPS_MODE}, 1) # If the golang-fips compiler is built with CGO_ENABLED=0, this needs to be # explicitly switched on. export CGO_ENABLED=1 + # Go 1.19+ now requires GOEXPERIMENT=boringcrypto for FIPS compilation. + # See https://github.com/golang/go/issues/51940 for more details. + BORINGCRYPTO_SUPPORT := $(shell GOEXPERIMENT=boringcrypto go version &> /dev/null; echo $$?) + ifeq ($(BORINGCRYPTO_SUPPORT), 0) + export GOEXPERIMENT=boringcrypto + endif endif MINIMUM_SUPPORTED_GO_VERSION := 1.11 |