Merge pull request #409 from NixOS/cxx-17

fix c++17 check
NixOS · Oct 26, 2022 · ea989ae · ea989ae
2 parents 75f25a3 + 9921136
commit ea989ae
Show file tree

Hide file tree

Showing 3 changed files with 1,011 additions and 60 deletions.
diff --git a/configure.ac b/configure.ac
@@ -28,17 +28,12 @@ AC_ARG_WITH([asan],
 )
 AM_CONDITIONAL([WITH_ASAN], [test x"$with_asan" = xyes])
 
+AX_CXX_COMPILE_STDCXX([17], [noext], [])
+
 AC_ARG_WITH([ubsan],
    AS_HELP_STRING([--with-ubsan], [Build with undefined behavior sanitizer])
 )
 AM_CONDITIONAL([WITH_UBSAN], [test x"$with_ubsan" = xyes])
 
-CPLUSPLUS=
-AX_CHECK_COMPILE_FLAG([-std=c++17], [CPLUSPLUS=17], [], [$WERROR])
-
-if test -z "$CPLUSPLUS"; then
-  AC_MSG_ERROR([Your compiler does not have the necessary C++17 support! Cannot proceed.])
-fi
-
 AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile patchelf.spec])
 AC_OUTPUT
diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4