do not --enable-test-32bit by default

This commit is contained in:
Lev Walkin 2017-10-19 00:33:54 -07:00
parent 1fef87a46f
commit 0a3bf61d0d
2 changed files with 7 additions and 9 deletions

View File

@ -3,7 +3,7 @@ compiler:
- gcc - gcc
- clang - clang
env: 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 - TASK=distcheck CONFIG_FLAGS="--enable-Werror --enable-test-Werror" DISTCHECK_CONFIGURE_FLAGS=$CONFIG_FLAGS
before_install: before_install:
- sudo apt-get install -y gcc-multilib lcov libasan* - sudo apt-get install -y gcc-multilib lcov libasan*

View File

@ -125,19 +125,17 @@ AX_CHECK_COMPILE_FLAG([-Wno-format],
[SKELETONS_CFLAGS="$SKELETONS_CFLAGS -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. dnl treat it like a special case to be checked.
AC_ARG_ENABLE([test-32bit], AC_ARG_ENABLE([test-32bit],
[AS_HELP_STRING([--disable-test-32bit], [AS_HELP_STRING([--enable-test-32bit],
[Disable tests for 32-bit compatibility])], [Enable tests for 32-bit compatibility])],
[disable_test_32bit=$enableval], [disable_test_32bit=maybe]) [enable_test_32bit=$enableval], [enable_test_32bit=no])
AS_IF([test "x$disable_test_32bit" != xno], [ AS_IF([test "x$enable_test_32bit" != xno], [
AX_CHECK_COMPILE_FLAG([-m32], [CFLAGS_M32=-m32], AX_CHECK_COMPILE_FLAG([-m32], [CFLAGS_M32=-m32],
[ [
CFLAGS_M32="" CFLAGS_M32=""
AS_IF([test "x$disable_test_32bit" != xmaybe], [ AC_MSG_FAILURE([--enable-test-32bit=$enable_test_32bit is requested but not supported by the _AC_LANG compiler])
AC_MSG_FAILURE([--disable-test-32bit=$disable_test_32bit is not supported on a target system.])
])
]) ])
]) ])
AC_SUBST(CFLAGS_M32) AC_SUBST(CFLAGS_M32)