Skip to content

Commit 5418b46

Browse files
committed
[SECCOMP-31582] - FIPS support
1 parent ffacb22 commit 5418b46

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

Makefile.common

+2-6
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
# Ensure GOBIN is not set during build so that promu is installed to the correct path
2626
unexport GOBIN
2727

28-
# Export flags required for FIPS compliance
29-
export CGO_ENABLED=1
30-
export GOEXPERIMENT=boringcrypto
31-
3228
GO ?= go
3329
GOFMT ?= $(GO)fmt
3430
FIRST_GOPATH := $(firstword $(subst :, ,$(shell $(GO) env GOPATH)))
@@ -154,7 +150,7 @@ common-test-short: $(GOTEST_DIR)
154150
.PHONY: common-test
155151
common-test: $(GOTEST_DIR)
156152
@echo ">> running all tests"
157-
$(GOTEST) $(test-flags) $(GOOPTS) $(pkgs)
153+
CGO_ENABLED=1 GOEXPERIMENT=boringcrypto $(GOTEST) $(test-flags) $(GOOPTS) $(pkgs)
158154

159155
$(GOTEST_DIR):
160156
@mkdir -p $@
@@ -201,7 +197,7 @@ common-unused:
201197
.PHONY: common-build
202198
common-build: promu
203199
@echo ">> building binaries"
204-
$(PROMU) build --prefix $(PREFIX) $(PROMU_BINARIES)
200+
CGO_ENABLED=1 GOEXPERIMENT=boringcrypto $(PROMU) build --prefix $(PREFIX) $(PROMU_BINARIES)
205201

206202
.PHONY: common-tarball
207203
common-tarball: promu

0 commit comments

Comments
 (0)