From 0a3bf61d0dbe6213508839ef94bcbf14497afce4 Mon Sep 17 00:00:00 2001 From: Lev Walkin Date: Thu, 19 Oct 2017 00:33:54 -0700 Subject: [PATCH] do not --enable-test-32bit by default --- .travis.yml | 2 +- configure.ac | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0ca934e7..b5a04910 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ compiler: - gcc - clang env: - - TASK=check CONFIG_FLAGS="--enable-Werror --enable-test-Werror --enable-code-coverage" + - TASK=check CONFIG_FLAGS="--enable-Werror --enable-test-Werror --enable-test-32bit --enable-code-coverage" - TASK=distcheck CONFIG_FLAGS="--enable-Werror --enable-test-Werror" DISTCHECK_CONFIGURE_FLAGS=$CONFIG_FLAGS before_install: - sudo apt-get install -y gcc-multilib lcov libasan* diff --git a/configure.ac b/configure.ac index 195e5b8d..92b04c21 100644 --- a/configure.ac +++ b/configure.ac @@ -125,19 +125,17 @@ AX_CHECK_COMPILE_FLAG([-Wno-format], [SKELETONS_CFLAGS="$SKELETONS_CFLAGS -Wno-format"]) -dnl If -m32 is available to create 32-bit code, +dnl If requested and -m32 is available to create 32-bit code, dnl treat it like a special case to be checked. AC_ARG_ENABLE([test-32bit], - [AS_HELP_STRING([--disable-test-32bit], - [Disable tests for 32-bit compatibility])], - [disable_test_32bit=$enableval], [disable_test_32bit=maybe]) -AS_IF([test "x$disable_test_32bit" != xno], [ + [AS_HELP_STRING([--enable-test-32bit], + [Enable tests for 32-bit compatibility])], + [enable_test_32bit=$enableval], [enable_test_32bit=no]) +AS_IF([test "x$enable_test_32bit" != xno], [ AX_CHECK_COMPILE_FLAG([-m32], [CFLAGS_M32=-m32], [ CFLAGS_M32="" - AS_IF([test "x$disable_test_32bit" != xmaybe], [ - AC_MSG_FAILURE([--disable-test-32bit=$disable_test_32bit is not supported on a target system.]) - ]) + AC_MSG_FAILURE([--enable-test-32bit=$enable_test_32bit is requested but not supported by the _AC_LANG compiler]) ]) ]) AC_SUBST(CFLAGS_M32)