Skip to content

Commit 0dd5c13

Browse files
xclaessedcbaker
authored andcommitted
cargo: Reconfigure when any Cargo.toml is modified
1 parent 0cb70e4 commit 0dd5c13

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
@@ -484,6 +484,9 @@ def __init__(self, env: Environment) -> None:
484484
# Rustc's config
485485
self.cfgs = self._get_cfgs()
486486

487+
def get_build_def_files(self) -> T.List[str]:
488+
return [os.path.join(subdir, 'Cargo.toml') for subdir in self.manifests]
489+
487490
def interpret(self, subdir: str) -> mparser.CodeBlockNode:
488491
manifest = self._load_manifest(subdir)
489492
pkg, cached = self._fetch_package(manifest.package.name, manifest.package.api)

mesonbuild/interpreter/interpreter.py

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

525525
def get_build_def_files(self) -> mesonlib.OrderedSet[str]:
526+
if self.environment.cargo:
527+
self.build_def_files.update(self.environment.cargo.get_build_def_files())
526528
return self.build_def_files
527529

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

0 commit comments

Comments
 (0)