Skip to content

Commit c1423e4

Browse files
committed
Revert "build: move HAVE_SANDBOX_CHECK out of MANFLAGS"
This reverts commit 5c6fa6a. The commit in question causes `HAVE_SANDBOX_CHECK` to always be unset (instead of only when `--disable-sandbox-check` is used), as its value was being passed to the compiler through `MANFLAGS`. Move the macro back into `MANFLAGS` for simplicity. Also, using `--disable-sandbox-check` breaks the tests and thus also breaks CI (see #6619). Relates to #6592.
1 parent 04572ef commit c1423e4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

config.mk.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
2828
HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
2929
HAVE_GCOV=@HAVE_GCOV@
3030
HAVE_MAN=@HAVE_MAN@
31-
HAVE_SANDBOX_CHECK=@HAVE_SANDBOX_CHECK@
3231

3332
# MANFLAGS
3433
HAVE_APPARMOR=@HAVE_APPARMOR@
@@ -45,6 +44,7 @@ HAVE_OUTPUT=@HAVE_OUTPUT@
4544
HAVE_OVERLAYFS=@HAVE_OVERLAYFS@
4645
HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@
4746
HAVE_PRIVATE_LIB=@HAVE_PRIVATE_LIB@
47+
HAVE_SANDBOX_CHECK=@HAVE_SANDBOX_CHECK@
4848
HAVE_SELINUX=@HAVE_SELINUX@
4949
HAVE_SUID=@HAVE_SUID@
5050
HAVE_USERNS=@HAVE_USERNS@
@@ -66,6 +66,7 @@ MANFLAGS = \
6666
$(HAVE_OVERLAYFS) \
6767
$(HAVE_PRIVATE_HOME) \
6868
$(HAVE_PRIVATE_LIB) \
69+
$(HAVE_SANDBOX_CHECK) \
6970
$(HAVE_SELINUX) \
7071
$(HAVE_SUID) \
7172
$(HAVE_USERNS) \

0 commit comments

Comments
 (0)