MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-04 21:08:57 +01:00
Code Issues Releases Wiki Activity

configure: Update the SD-6 check; remove old GCC5/6 workarounds.

Browse source
This commit is contained in:
Jason Volk 2019-02-25 11:30:27 -08:00
parent 5910b97e03
commit cb20e86223
1 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
configure.ac
View file

@ -27,7 +27,7 @@ AC_PROG_LIBTOOL
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_LANG(C++) AC_LANG(C++)
AC_CONFIG_HEADER(include/ircd/config.h) AC_CONFIG_HEADER(include/ircd/config.h)
AX_CXX_COMPILE_STDCXX([17], [gnu], [mandatory], 201500) AX_CXX_COMPILE_STDCXX([17], [gnu], [mandatory], 201703)
dnl *************************************************************************** dnl ***************************************************************************
@ -132,30 +132,6 @@ AM_CONDITIONAL([SOLARIS], [[[[ $host_os = *solaris* ]]]])
RB_DEFINE_UNQUOTED([OS], ["$host_os"], [Host operating system]) RB_DEFINE_UNQUOTED([OS], ["$host_os"], [Host operating system])
dnl
dnl The CXX standard check even with the sd6 check wasn't enough for GCC. This
dnl is because we're developing with C++15'ish, which is in some grey area
dnl between C++14 and C++17 and the implementation differs between GCC 5.x and
dnl GCC 6.x. The build will b0rk with GCC 5.x so the version must be checked.
dnl
AC_MSG_CHECKING(whether specific compiler version is sufficient)
AM_COND_IF([GCC],
[
gvmaj=`$CXX -dumpversion | cut -d"." -f1`
gvmin=`$CXX -dumpversion | cut -d"." -f2`
if [[ "$gvmaj" -ge "6" ]]; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
AC_MSG_ERROR([Did you forget to export CXX=g++-6 ?])
fi
], [
AC_MSG_RESULT([yes])
])
dnl *************************************************************************** dnl ***************************************************************************
dnl dnl
dnl Developer options dnl Developer options