vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

build: Fix option to explicitly disable memory debugging

Browse source 
The memory management system supports a debug mode that can be enabled
at build time by passing "--enable-mm-debug" to the configure script.
Passing the option will cause us define MM_DEBUG as expected, but in
fact the reverse option "--disable-mm-debug" will do the exact same
thing and also set up the define. This currently causes the build of
"lib/gnulib/base64.c" to fail as it tries to use `grub_debug_malloc()`
and `grub_debug_free()` even though both symbols aren't defined.

Seemingly, `AC_ARG_ENABLE()` will always execute the third argument if
either the positive or negative option was passed. Let's thus fix the
issue by moving the call to`AC_DEFINE()` into an explicit `if test
$xenable_mm_debug` block, similar to how other defines work.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
This commit is contained in:
Patrick Steinhardt 2020-03-07 17:29:08 +01:00 committed by Daniel Kiper
parent 20def1a3c3
commit 2c43ab4ef7
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -1453,9 +1453,11 @@ LIBS="$tmp_LIBS"
# Memory manager debugging. # Memory manager debugging.
AC_ARG_ENABLE([mm-debug], AC_ARG_ENABLE([mm-debug],
AS_HELP_STRING([--enable-mm-debug], AS_HELP_STRING([--enable-mm-debug],
[include memory manager debugging]), [include memory manager debugging]))
[AC_DEFINE([MM_DEBUG], [1], if test x$enable_mm_debug = xyes; then
[Define to 1 if you enable memory manager debugging.])]) AC_DEFINE([MM_DEBUG], [1],
[Define to 1 if you enable memory manager debugging.])
fi
AC_ARG_ENABLE([cache-stats], AC_ARG_ENABLE([cache-stats],
AS_HELP_STRING([--enable-cache-stats], AS_HELP_STRING([--enable-cache-stats],