Skip to content

Commit

Permalink
Revert "build: move HAVE_SANDBOX_CHECK out of MANFLAGS"
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
kmk3 committed Jan 16, 2025
1 parent 04572ef commit c1423e4
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion config.mk.in
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
HAVE_GCOV=@HAVE_GCOV@
HAVE_MAN=@HAVE_MAN@
HAVE_SANDBOX_CHECK=@HAVE_SANDBOX_CHECK@

# MANFLAGS
HAVE_APPARMOR=@HAVE_APPARMOR@
Expand All @@ -45,6 +44,7 @@ HAVE_OUTPUT=@HAVE_OUTPUT@
HAVE_OVERLAYFS=@HAVE_OVERLAYFS@
HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@
HAVE_PRIVATE_LIB=@HAVE_PRIVATE_LIB@
HAVE_SANDBOX_CHECK=@HAVE_SANDBOX_CHECK@
HAVE_SELINUX=@HAVE_SELINUX@
HAVE_SUID=@HAVE_SUID@
HAVE_USERNS=@HAVE_USERNS@
Expand All @@ -66,6 +66,7 @@ MANFLAGS = \
$(HAVE_OVERLAYFS) \
$(HAVE_PRIVATE_HOME) \
$(HAVE_PRIVATE_LIB) \
$(HAVE_SANDBOX_CHECK) \
$(HAVE_SELINUX) \
$(HAVE_SUID) \
$(HAVE_USERNS) \
Expand Down

0 comments on commit c1423e4

Please sign in to comment.