From 4a60d08bd5debb3678e939988633a2ba04a758c7 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 13 Apr 2023 06:15:43 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 workhorse/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'workhorse')

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
-- 
cgit v1.2.1