diff options
| author | rubidium <rubidium@openttd.org> | 2016-06-27 17:54:05 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2016-06-27 17:54:05 +0000 |
| commit | e956422f48a573212783cd7060e622bf1b000cf2 (patch) | |
| tree | 9d91abbbc0aaa17df905d43b827a556c13e0e1b3 /config.lib | |
| parent | ac6312d33cfd1498894326dc2ecadaca8aed0ee4 (diff) | |
| download | openttd-e956422f48a573212783cd7060e622bf1b000cf2.tar.xz | |
(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
Diffstat (limited to 'config.lib')
| -rw-r--r-- | config.lib | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config.lib b/config.lib index 021f95cb2..2ef67123e 100644 --- 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 |