cpp/openttd-patchpack/source Changeset - r22402:9d5e2de1aafb

Changeset - r22402:9d5e2de1aafb

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 8 years ago 2016-06-27 17:54:05
rubidium@openttd.org

(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

1 file changed with 2 insertions and 2 deletions:

config.lib

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -1377,13 +1377,13 @@ make_compiler_cflags() { @@
 			flags="$flags -fno-strict-overflow"
 			# GCC 4.2 no longer includes -Wnon-virtual-dtor in -Wall.
 			# Enable it in order to be consistent with older GCC versions.
 			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"
 		fi
 		if [ $cc_version -eq 45 ]; then
@@ @@ -1401,13 +1401,13 @@ make_compiler_cflags() { @@
 			flags="$flags -Wno-free-nonheap-object"
 		fi
 		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
 			# GCC 4.5 outputs '%{flto}', GCC 4.6 outputs '%{flto*}'
 			has_lto=`$1 -dumpspecs | grep '\%{flto'`
 			if [ -n "$has_lto" ]; then

0 comments (0 inline, 0 general)