Skip to content

Commit 9cb6cc8

Browse files
committed
cargo: Reconfigure when any Cargo.toml is modified
1 parent 33277be commit 9cb6cc8

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

mesonbuild/cargo/interpreter.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ def __init__(self, env: Environment) -> None:
9191
# Rustc's config
9292
self.cfgs = self._get_cfgs()
9393

94+
def get_build_def_files(self) -> T.List[str]:
95+
return [os.path.join(subdir, 'Cargo.toml') for subdir in self.manifests.keys()]
96+
9497
def interpret(self, subdir: str, project_root: T.Optional[str] = None) -> mparser.CodeBlockNode:
9598
manifest = self._load_manifest(subdir)
9699
filename = os.path.join(self.environment.source_dir, subdir, 'Cargo.toml')

mesonbuild/interpreter/interpreter.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,8 @@ def handle_meson_version_from_ast(self) -> None:
524524
self.handle_meson_version(val.value, val)
525525

526526
def get_build_def_files(self) -> mesonlib.OrderedSet[str]:
527+
if self.environment.cargo:
528+
self.build_def_files.update(self.environment.cargo.get_build_def_files())
527529
return self.build_def_files
528530

529531
def add_build_def_file(self, f: mesonlib.FileOrString) -> None:

0 commit comments

Comments
 (0)