diff -ur meson-0.42.0/mesonbuild/compilers/cpp.py meson-0.42.patched/mesonbuild/compilers/cpp.py --- meson-0.42.0/mesonbuild/compilers/cpp.py 2017-08-13 20:43:17.000000000 +0200 +++ meson-0.42.patched/mesonbuild/compilers/cpp.py 2017-08-15 12:42:07.216511972 +0200 @@ -75,9 +75,13 @@ '3': default_warn_args + ['-Wextra', '-Wpedantic']} def get_options(self): + c_stds = ['c++03', 'c++11'] + g_stds = ['gnu++11'] + if mesonlib.version_compare(self.version, '>=5.0.0'): + c_stds += ['c++14', 'c++1z'] + g_stds += ['gnu++14', 'gnu++1z'] return {'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use', - ['none', 'c++03', 'c++11', 'c++14', 'c++1z', - 'gnu++11', 'gnu++14', 'gnu++1z'], + ['none'] + c_stds + g_stds, 'none')} def get_option_compile_args(self, options):