Skip to content

Commit

Permalink
interpreter: Remove redundant .update()
Browse files Browse the repository at this point in the history
The subproject shares the PerMachine instance with us, so there's no
need to synchronize it.
  • Loading branch information
oleavr committed Mar 18, 2024
1 parent f29daa0 commit d5a174f
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion mesonbuild/interpreter/interpreter.py
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,6 @@ def _do_subproject_meson(self, subp_name: SubProject, subdir: str,
if pv == 'undefined' or not mesonlib.version_compare_many(pv, wanted)[0]:
raise InterpreterException(f'Subproject {subp_name} version is {pv} but {wanted} required.')
self.active_projectname = current_active
self.subprojects[for_machine].update(subi.subprojects[for_machine])
self.subprojects[for_machine][subp_name] = SubprojectHolder(
subi, subdir, warnings=subi_warnings, callstack=self.subproject_stack)
# Duplicates are possible when subproject uses files from project root
Expand Down

0 comments on commit d5a174f

Please sign in to comment.