From 56cc4110e1ef0667ff248a689c50803c2ec4312b Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Fri, 31 May 2019 02:30:37 +0300 Subject: [PATCH 2/3] build: add --disable-defaultflags Align with tpm2-tss to allow downstream to provide flags. Signed-off-by: Alon Bar-Lev --- configure.ac | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index d14c4d7..3ee45c5 100644 --- a/configure.ac +++ b/configure.ac @@ -84,23 +84,30 @@ AC_ARG_ENABLE([tctienvvar], AC_CONFIG_FILES([Makefile]) -AX_ADD_COMPILER_FLAG([-std=c99]) -AX_ADD_COMPILER_FLAG([-Wall]) -AX_ADD_COMPILER_FLAG([-Wextra]) -AX_ADD_COMPILER_FLAG([-Wformat-security]) -AX_ADD_COMPILER_FLAG([-Werror]) -AX_ADD_COMPILER_FLAG([-fstack-protector-all]) -AX_ADD_COMPILER_FLAG([-fpic]) -AX_ADD_COMPILER_FLAG([-fPIC]) - -# work around GCC bug #53119 -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119 -AX_ADD_COMPILER_FLAG([-Wno-missing-braces]) - -AX_ADD_LINK_FLAG([-Wl,--no-undefined]) -AX_ADD_LINK_FLAG([-Wl,-z,noexecstack]) -AX_ADD_LINK_FLAG([-Wl,-z,now]) -AX_ADD_LINK_FLAG([-Wl,-z,relro]) +AC_ARG_ENABLE([defaultflags], + [AS_HELP_STRING([--disable-defaultflags], + [Disable default preprocessor, compiler, and linker flags.])],, + [enable_defaultflags=yes]) +AS_IF([test "x$enable_defaultflags" = "xyes"], + [ + AX_ADD_COMPILER_FLAG([-std=c99]) + AX_ADD_COMPILER_FLAG([-Wall]) + AX_ADD_COMPILER_FLAG([-Wextra]) + AX_ADD_COMPILER_FLAG([-Wformat-security]) + AX_ADD_COMPILER_FLAG([-Werror]) + AX_ADD_COMPILER_FLAG([-fstack-protector-all]) + AX_ADD_COMPILER_FLAG([-fpic]) + AX_ADD_COMPILER_FLAG([-fPIC]) + + # work around GCC bug #53119 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119 + AX_ADD_COMPILER_FLAG([-Wno-missing-braces]) + + AX_ADD_LINK_FLAG([-Wl,--no-undefined]) + AX_ADD_LINK_FLAG([-Wl,-z,noexecstack]) + AX_ADD_LINK_FLAG([-Wl,-z,now]) + AX_ADD_LINK_FLAG([-Wl,-z,relro]) + ]) AX_CODE_COVERAGE m4_ifdef([_AX_CODE_COVERAGE_RULES], -- 2.24.1