diff options
| author | Haakon Sporsheim <haakon.sporsheim@gmail.com> | 2017-03-10 11:55:05 +0100 |
|---|---|---|
| committer | Haakon Sporsheim <haakon.sporsheim@gmail.com> | 2017-03-10 12:33:21 +0100 |
| commit | c9fe3a3ad4f58e2a263f8fc30c21bc009c109480 (patch) | |
| tree | 7b4d127a062dc9baa519e317b238d34bdcff8cd2 /mesonbuild/interpreter.py | |
| parent | 1e2c914b3c508e1749890be85867e1f51336ece1 (diff) | |
| download | meson-c9fe3a3ad4f58e2a263f8fc30c21bc009c109480.zip meson-c9fe3a3ad4f58e2a263f8fc30c21bc009c109480.tar.gz meson-c9fe3a3ad4f58e2a263f8fc30c21bc009c109480.tar.bz2 | |
compiler: Ensure prefix and dependencies are used for alignment.
This is now similar to how prefix and dependencies are used in all
the other similar checks performed by the compiler.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index bd818bb..9e8b136 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -700,8 +700,12 @@ class CompilerHolder(InterpreterObject): raise InterpreterException('Alignment method takes exactly one positional argument.') check_stringlist(args) typename = args[0] + prefix = kwargs.get('prefix', '') + if not isinstance(prefix, str): + raise InterpreterException('Prefix argument of sizeof must be a string.') extra_args = mesonlib.stringlistify(kwargs.get('args', [])) - result = self.compiler.alignment(typename, self.environment, extra_args) + deps = self.determine_dependencies(kwargs) + result = self.compiler.alignment(typename, prefix, self.environment, extra_args, deps) mlog.log('Checking for alignment of "', mlog.bold(typename), '": ', result, sep='') return result |