diff options
| author | Christoph Behle <behlec@gmail.com> | 2018-06-11 19:57:34 +0200 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-06-12 00:14:54 +0000 |
| commit | 47c3a26915ffa12b3a9a14a3da485c1a0d5ab32c (patch) | |
| tree | 3c77986bf00f65a5fe2a0b91c44ece0bd96a69d8 /mesonbuild/compilers/c.py | |
| parent | b19b714f374f7bbf9fe049ff7239f25d3ec5b108 (diff) | |
| download | meson-47c3a26915ffa12b3a9a14a3da485c1a0d5ab32c.zip meson-47c3a26915ffa12b3a9a14a3da485c1a0d5ab32c.tar.gz meson-47c3a26915ffa12b3a9a14a3da485c1a0d5ab32c.tar.bz2 | |
Always apply concatenate_string_literal.
get_define always applies concatenate_string_literal to its result.
Remove kwarg concatenate_string_literal from get_define.
Diffstat (limited to 'mesonbuild/compilers/c.py')
| -rw-r--r-- | mesonbuild/compilers/c.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index e34779b..ef67e03 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -569,7 +569,7 @@ class CCompiler(Compiler): # Get the preprocessed value after the delimiter, # minus the extra newline at the end and # merge string literals. - return p.stdo.split(delim + '\n')[-1][:-1] + return CCompiler.concatenate_string_literals(p.stdo.split(delim + '\n')[-1][:-1]) def get_return_value(self, fname, rtype, prefix, env, extra_args, dependencies): if rtype == 'string': |