Skip to content

Commit 88c2c10

Browse files
committed
_meson_version_configured is build_dir dependent
1 parent d8eac75 commit 88c2c10

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

spin/cmds/meson.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@ def _meson_version():
172172
pass
173173

174174

175-
def _meson_version_configured():
175+
def _meson_version_configured(build_dir):
176176
try:
177-
meson_info_fn = os.path.join("build", "meson-info", "meson-info.json")
177+
meson_info_fn = os.path.join(build_dir, "meson-info", "meson-info.json")
178178
with open(meson_info_fn) as f:
179179
meson_info = json.load(f)
180180
return meson_info["meson_version"]["full"]
@@ -316,7 +316,7 @@ def build(
316316
if os.path.isdir(install_dir):
317317
shutil.rmtree(install_dir)
318318

319-
if not (os.path.exists(build_dir) and _meson_version_configured()):
319+
if not (os.path.exists(build_dir) and _meson_version_configured(build_dir)):
320320
p = _run(setup_cmd, sys_exit=False, output=not quiet)
321321
if p.returncode != 0:
322322
raise RuntimeError(
@@ -326,7 +326,7 @@ def build(
326326
# Build dir has been configured; check if it was configured by
327327
# current version of Meson
328328

329-
if (_meson_version() != _meson_version_configured()) or (
329+
if (_meson_version() != _meson_version_configured(build_dir)) or (
330330
gcov and not _meson_coverage_configured()
331331
):
332332
_run(setup_cmd + ["--reconfigure"], output=not quiet)

0 commit comments

Comments
 (0)