diff options
| author | Charles Pigott <charlespigott@googlemail.com> | 2018-11-25 11:27:08 +0000 |
|---|---|---|
| committer | Patric Stout <truebrain@openttd.org> | 2019-01-05 17:39:11 +0100 |
| commit | 4fbfe34e3697b4275212d9e569d05af398552fda (patch) | |
| tree | 9b77ee69506d0d8b48b38c07addbcba8bcf14642 | |
| parent | 175829b8b5a24efaa46e18d2a0d0b1f59d14e72d (diff) | |
| download | openttd-4fbfe34e3697b4275212d9e569d05af398552fda.tar.xz | |
Codechange: Always compile with C++11
| -rw-r--r-- | config.lib | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/config.lib b/config.lib index c5b7ee09c..1af354e16 100644 --- a/config.lib +++ b/config.lib @@ -1317,8 +1317,6 @@ make_compiler_cflags() { if [ $cc_version -ge 110 ]; then # remark #2259: non-pointer conversion from ... to ... may lose significant bits flags="$flags -wd2259" - # Use c++0x mode so static_assert() is available - cxxflags="$cxxflags -std=c++0x" fi if [ "$enable_lto" != "0" ]; then @@ -1380,11 +1378,6 @@ make_compiler_cflags() { flags="$flags -Wno-unused-variable" fi - if [ "$cc_version" -ge "33" ]; then - # clang completed C++11 support in version 3.3 - flags="$flags -std=c++11" - fi - # rdynamic is used to get useful stack traces from crash reports. ldflags="$ldflags -rdynamic" @@ -1443,12 +1436,6 @@ make_compiler_cflags() { flags="$flags -Wnon-virtual-dtor" fi - if [ $cc_version -ge 403 ] && [ $cc_version -lt 600 ]; 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 405 ]; then # Prevent optimisation supposing enums are in a range specified by the standard # For details, see http://gcc.gnu.org/PR43680 @@ -1470,7 +1457,7 @@ make_compiler_cflags() { if [ $cc_version -ge 600 ]; then # -flifetime-dse=2 (default since GCC 6) doesn't play # well with our custom pool item allocator - cxxflags="$cxxflags -flifetime-dse=1 -std=gnu++14" + cxxflags="$cxxflags -flifetime-dse=1" fi if [ "$enable_lto" != "0" ]; then @@ -1533,6 +1520,8 @@ make_cflags_and_ldflags() { CFLAGS="$CFLAGS -D$os" CFLAGS_BUILD="$CFLAGS_BUILD -D$os" + CXXFLAGS="$CXXFLAGS -std=c++11" + CXXFLAGS_BUILD="$CXXFLAGS_BUILD -std=c++11" if [ "$enable_debug" = "0" ]; then # No debug, add default stuff |