From 16181cbb107ea70a72f41982b371c444926f48f2 Mon Sep 17 00:00:00 2001 From: George Dunlap Date: Wed, 2 Sep 2015 10:34:55 +0100 Subject: [PATCH] tools: Honor Config.mk debug value, rather than setting our own Changeset 1166ecf ('tools/Rules.mk: Don't optimize debug builds; add macro debugging information') exposed a bug whereby the autoconf stuff in tools was setting its own debug value (defaulting to ENABLED, even for releases) instead of honoring the value set in Config.mk. After that changeset, if the global build has -D_FORTIFY_SOURCE enabled (as is the default in CentOS 7 rpmbuild), then the tools build will fail (because debug builds default to on). There should be only one place to specify whether to build debug or not, and Config.mk is already included by the relevant makefiles. So simply remove the tools/configure debug option and everything falls into place naturally. Signed-off-by: George Dunlap Acked-by: Ian Campbell Acked-by: Wei Liu --- tools/configure | 26 -------------------------- tools/configure.ac | 1 - 2 files changed, 27 deletions(-) diff --git a/tools/configure b/tools/configure index 428b3a5ac8..884ce0ad22 100755 --- a/tools/configure +++ b/tools/configure @@ -707,7 +707,6 @@ rombios qemu_traditional blktap2 LINUX_BACKEND_MODULES -debug seabios ovmf xsmpolicy @@ -798,7 +797,6 @@ enable_ocamltools enable_xsmpolicy enable_ovmf enable_seabios -enable_debug with_linux_backend_modules enable_blktap2 enable_qemu_traditional @@ -1473,7 +1471,6 @@ Optional Features: --disable-xsmpolicy Disable XSM policy compilation (default is ENABLED) --enable-ovmf Enable OVMF (default is DISABLED) --disable-seabios Disable SeaBIOS (default is ENABLED) - --disable-debug Disable debug build of tools (default is ENABLED) --enable-blktap2 Enable blktap2, (DEFAULT is on for Linux, otherwise off) --enable-qemu-traditional @@ -4114,29 +4111,6 @@ seabios=$ax_cv_seabios -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : - enableval=$enable_debug; -fi - - -if test "x$enable_debug" = "xno"; then : - - ax_cv_debug="n" - -elif test "x$enable_debug" = "xyes"; then : - - ax_cv_debug="y" - -elif test -z $ax_cv_debug; then : - - ax_cv_debug="y" - -fi -debug=$ax_cv_debug - - - # Check whether --with-linux-backend-modules was given. if test "${with_linux_backend_modules+set}" = set; then : diff --git a/tools/configure.ac b/tools/configure.ac index 7daec99b6b..6c70040164 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -83,7 +83,6 @@ AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools]) AX_ARG_DEFAULT_ENABLE([xsmpolicy], [Disable XSM policy compilation]) AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF]) AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS]) -AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools]) AC_ARG_WITH([linux-backend-modules], AS_HELP_STRING([--with-linux-backend-modules="mod1 mod2"], -- 2.39.5