diff options
| author | Stan Hu <stanhu@gmail.com> | 2023-04-13 22:00:58 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2023-04-13 22:00:58 +0000 |
| commit | f8fe5dfdb431839985fe2923952ad073bf2f4022 (patch) | |
| tree | ef1eeac23f586bc29229317ca20a814fe4a33346 | |
| parent | 124ebdd255e6a391639e5f579de5c7d65be88b50 (diff) | |
| parent | f8e7110039c2c9d1f7852d7e12797909806fb577 (diff) | |
| download | gitlab-shell-f8fe5dfdb431839985fe2923952ad073bf2f4022.tar.gz | |
Merge branch 'posix-boring-crypto' into 'main'
Make the boringcrypto check POSIX shell compliant
See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/725
Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: DJ Mountney <dj@gitlab.com>
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |