diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-05 00:13:27 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-06 16:08:24 +0200 |
| commit | bf4a1496ea04796a4ee0980a77898b971287425c (patch) | |
| tree | 0c2d2e8ddc541eca397317f61897f55ab88f4439 /mesonbuild/compilers | |
| parent | e2afaf40c0d1c4bfbc4032d955f6cd65a20a0cba (diff) | |
| download | meson-arrayname.tar.gz | |
Renamed UserStringArrayOption to UserArrayOption for short.arrayname
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/c.py | 10 | ||||
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index 2d123142e..0f92e7880 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -839,8 +839,8 @@ class GnuCCompiler(GnuCompiler, CCompiler): 'none')} if self.gcc_type == GCC_MINGW: opts.update({ - 'c_winlibs': coredata.UserStringArrayOption('c_winlibs', 'Standard Win libraries to link against', - gnu_winlibs), }) + 'c_winlibs': coredata.UserArrayOption('c_winlibs', 'Standard Win libraries to link against', + gnu_winlibs), }) return opts def get_option_compile_args(self, options): @@ -1012,9 +1012,9 @@ class VisualStudioCCompiler(CCompiler): return [] def get_options(self): - return {'c_winlibs': coredata.UserStringArrayOption('c_winlibs', - 'Windows libs to link against.', - msvc_winlibs) + return {'c_winlibs': coredata.UserArrayOption('c_winlibs', + 'Windows libs to link against.', + msvc_winlibs) } def get_option_link_args(self, options): diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index 15eb9a0e6..7634cc40d 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -110,7 +110,7 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler): False)} if self.gcc_type == GCC_MINGW: opts.update({ - 'cpp_winlibs': coredata.UserStringArrayOption('cpp_winlibs', 'Standard Win libraries to link against', + 'cpp_winlibs': coredata.UserArrayOption('cpp_winlibs', 'Standard Win libraries to link against', gnu_winlibs), }) return opts @@ -188,9 +188,9 @@ class VisualStudioCPPCompiler(VisualStudioCCompiler, CPPCompiler): 'C++ exception handling type.', ['none', 'a', 's', 'sc'], 'sc'), - 'cpp_winlibs': coredata.UserStringArrayOption('cpp_winlibs', - 'Windows libs to link against.', - msvc_winlibs) + 'cpp_winlibs': coredata.UserArrayOption('cpp_winlibs', + 'Windows libs to link against.', + msvc_winlibs) } def get_option_compile_args(self, options): |