Update args_frozen attribute check.

Attribute args_frozen doesn't exist anymore. Check against
project_args_frozen/global_args_frozen instead.
pull/2024/head
Hemmo Nieminen 7 years ago committed by Jussi Pakkanen
parent 2f691410fc
commit 3a59379ec1
  1. 2
      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 # 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. # about the interpreter so we can't import it and use isinstance.
# This should be reliable enough. # 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' raise InvalidArguments('Tried to use subproject object as a dependency.\n'
'You probably wanted to use a dependency declared in it instead.\n' 'You probably wanted to use a dependency declared in it instead.\n'
'Access it by calling get_variable() on the subproject object.') 'Access it by calling get_variable() on the subproject object.')

Loading…
Cancel
Save