diff -Nur meson-0.41.0/mesonbuild/compilers.py new/mesonbuild/compilers.py --- meson-0.41.0/mesonbuild/compilers.py 2017-06-12 20:30:20.000000000 +0200 +++ new/mesonbuild/compilers.py 2017-06-19 13:43:25.771564616 +0200 @@ -2621,9 +2621,13 @@ '3': default_warn_args + ['-Wextra', '-Wpedantic']} def get_options(self): + c_stds = ['c++03', 'c++11'] + g_stds = ['gnu++03', 'gnu++11'] + if mesonlib.version_compare(self.version, '>=5.0.0'): + c_stds += ['c++14', 'c++1z'] + g_stds += ['gnu++14', 'gnu++1z'] opts = {'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use', - ['none', 'c++03', 'c++11', 'c++14', 'c++1z', - 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++1z'], + ['none'] + c_stds + g_stds, 'none'), 'cpp_debugstl': coredata.UserBooleanOption('cpp_debugstl', 'STL debug mode',