diff options
| author | Hemmo Nieminen <hemmo.nieminen@iki.fi> | 2017-06-30 23:26:34 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-02 10:52:24 -0400 |
| commit | 3a59379ec1de6c8043f822cec78e09055ab89185 (patch) | |
| tree | ef79b04d2c878f1c6c78219823d436da5e96f46b | |
| parent | 2f691410fc4a6c35ff69efa3644610e37dccda2a (diff) | |
| download | meson-3a59379ec1de6c8043f822cec78e09055ab89185.zip meson-3a59379ec1de6c8043f822cec78e09055ab89185.tar.gz meson-3a59379ec1de6c8043f822cec78e09055ab89185.tar.bz2 | |
Update args_frozen attribute check.
Attribute args_frozen doesn't exist anymore. Check against
project_args_frozen/global_args_frozen instead.
| -rw-r--r-- | mesonbuild/build.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index c73ba3a..dd4f7b7 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -817,7 +817,7 @@ You probably should put it in link_with instead.''') # This is a bit of a hack. We do not want Build to know anything # about the interpreter so we can't import it and use isinstance. # This should be reliable enough. - if hasattr(dep, 'args_frozen'): + if hasattr(dep, 'project_args_frozen') or hasattr('global_args_frozen'): raise InvalidArguments('Tried to use subproject object as a dependency.\n' 'You probably wanted to use a dependency declared in it instead.\n' 'Access it by calling get_variable() on the subproject object.') |