summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Mountney <dj@gitlab.com>2023-04-13 14:46:43 -0700
committerDJ Mountney <dj@gitlab.com>2023-04-13 14:46:43 -0700
commitf8e7110039c2c9d1f7852d7e12797909806fb577 (patch)
treeef1eeac23f586bc29229317ca20a814fe4a33346
parent124ebdd255e6a391639e5f579de5c7d65be88b50 (diff)
downloadgitlab-shell-f8e7110039c2c9d1f7852d7e12797909806fb577.tar.gz
Make the boringcrypto check POSIX shell compliant
- Otherwise this fails on some of the omnibus builder images
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e73f034..c89ff82 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ BUILD_TAGS := tracer_static tracer_static_jaeger continuous_profiler_stackdriver
ifeq (${FIPS_MODE}, 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 $$?)
+ BORINGCRYPTO_SUPPORT := $(shell GOEXPERIMENT=boringcrypto go version > /dev/null 2>&1; echo $$?)
ifeq ($(BORINGCRYPTO_SUPPORT), 0)
GOBUILD_ENV=GOEXPERIMENT=boringcrypto
endif