# HG changeset patch
# User rubidium <rubidium@openttd.org>
# Date 2016-06-27 17:54:05
# Node ID 9d5e2de1aafb529537569cbf9add23d9c07755d0
# Parent  3acd2f3705e834920ceab95dbbd11c01af607b1e

(svn r27606) -Change/fix: GCC6 defaults to C++14, but our configure limits it to C++0x just because we want to use features from C++0x (which are also in C++14), so use the C++ standard that's the GCC6 default

diff --git a/config.lib b/config.lib
--- a/config.lib
+++ b/config.lib
@@ -1380,7 +1380,7 @@ make_compiler_cflags() {
 			flags="$flags -Wnon-virtual-dtor"
 		fi
 
-		if [ $cc_version -ge 43 ]; then
+		if [ $cc_version -ge 43 ] && [ $cc_version -lt 60 ]; then
 			# Use gnu++0x mode so static_assert() is available.
 			# Don't use c++0x, it breaks mingw (with gcc 4.4.0).
 			cxxflags="$cxxflags -std=gnu++0x"
@@ -1404,7 +1404,7 @@ make_compiler_cflags() {
 		if [ $cc_version -ge 60 ]; then
 			# -flifetime-dse=2 (default since GCC 6) doesn't play
 			# well with our custom pool item allocator
-			cxxflags="$cxxflags -flifetime-dse=1"
+			cxxflags="$cxxflags -flifetime-dse=1 -std=gnu++14"
 		fi
 
 		if [ "$enable_lto" != "0" ]; then