Use c++1z to enable c++17

It increases compatibility with older qt versions.
This commit is contained in:
sledgehammer999 2021-01-06 21:54:46 +02:00
parent e4c177fec7
commit 7fe7c6c277
No known key found for this signature in database
GPG key ID: 6E4A2D025B7CC9A2
2 changed files with 2 additions and 2 deletions

2
configure vendored
View file

@ -6711,7 +6711,7 @@ if ac_fn_cxx_try_compile "$LINENO"
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++17"
QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++1z"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: C++17 mode is now force enabled. The C++ mode should match the mode that other libraries were built with, otherwise you'll likely get linking errors." >&5
printf "%s\n" "$as_me: WARNING: C++17 mode is now force enabled. The C++ mode should match the mode that other libraries were built with, otherwise you'll likely get linking errors." >&2;}
else $as_nop

View file

@ -216,7 +216,7 @@ AS_IF([test "x$QBT_CXX17_FOUND" = "xno"],
CXXFLAGS="-std=c++17 $TMP_CXXFLAGS"
AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()],
[AC_MSG_RESULT([no])
QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++17"
QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++1z"
AC_MSG_WARN([C++17 mode is now force enabled. The C++ mode should match the mode that other libraries were built with, otherwise you'll likely get linking errors.])],
[AC_MSG_RESULT([yes])
AC_MSG_ERROR([The compiler supports C++17 but the user or a dependency has explicitly enabled a lower mode.])])],