diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-06-14 08:38:35 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-06-20 11:03:21 +0300 |
| commit | ef74de3c567594f6a7206a3f50e8f3e7ef2c988e (patch) | |
| tree | 614ad21d6be5ad13c2e770610dc901c8300623bf | |
| parent | 2b069d8536df98547acba92719b7554d1c7f2262 (diff) | |
Makefile: Adjust `FIPS_MODE` to match behaviour of other switches
The `FIPS_MODE` variable needs to be set to `1` in order to enable usage
of FIPS in our Makefile. This is different from all the other variables,
where we only verify that the variable is defined to a non-empty value.
Adjust the behaviour of this variable to match our other toggles. This
should be a backwards-compatible change: all existing sites that enable
FIPS modes are passing `FIPS_MODE=1`, which continues to behave the
same.
| -rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -41,7 +41,6 @@ bindir ?= ${exec_prefix}/bin INSTALL_DEST_DIR := ${DESTDIR}${bindir} ## The prefix where Git will be installed to. GIT_PREFIX ?= ${GIT_DEFAULT_PREFIX} -FIPS_MODE ?= 0 # Tools GIT := $(shell command -v git) @@ -75,7 +74,11 @@ GIT2GO_BUILD_TAGS := static,system_libgit2 # of the string "TEMP_GITALY_BUILD_ID". TEMPORARY_BUILD_ID := 54454D505F474954414C595F4255494C445F4944 -ifeq (${FIPS_MODE}, 1) +## FIPS_MODE controls whether to build Gitaly and dependencies in FIPS mode. +## Set this to a non-empty value to enable it. +FIPS_MODE ?= + +ifdef FIPS_MODE SERVER_BUILD_TAGS := ${SERVER_BUILD_TAGS},fips GIT2GO_BUILD_TAGS := ${GIT2GO_BUILD_TAGS},fips |