aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/cpp.py
diff options
context:
space:
mode:
authorThomas Hindoe Paaboel Andersen <phomes@gmail.com>2018-07-13 16:39:26 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2018-07-13 20:00:50 +0300
commite2c36457c5b6a21367a30f9b2076a5ab2cd65678 (patch)
treedc2180c7f86ecc569c2c72b1050b48ffb68a0e0a /mesonbuild/compilers/cpp.py
parentc3e68189cd23b6a94d9c1f94f69770e5006857f6 (diff)
downloadmeson-e2c36457c5b6a21367a30f9b2076a5ab2cd65678.zip
meson-e2c36457c5b6a21367a30f9b2076a5ab2cd65678.tar.gz
meson-e2c36457c5b6a21367a30f9b2076a5ab2cd65678.tar.bz2
Avoid concatenating two options in list
'c++17' and 'gnu++98' were concatenated due to a missing comma
Diffstat (limited to 'mesonbuild/compilers/cpp.py')
-rw-r--r--mesonbuild/compilers/cpp.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index 126900a..7344114 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -111,7 +111,7 @@ class ArmclangCPPCompiler(ArmclangCompiler, CPPCompiler):
def get_options(self):
opts = CPPCompiler.get_options(self)
opts.update({'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use',
- ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17'
+ ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17',
'gnu++98', 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17'],
'none')})
return opts