From 082a3f3fbba7980cd79393cc5aa2f5c4cfeecd9a Mon Sep 17 00:00:00 2001 From: puddly <32534428+puddly@users.noreply.github.com> Date: Mon, 11 Nov 2024 13:49:13 -0500 Subject: [PATCH] Inject the current Python `bin` path into `make` invocation --- tools/build_project.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/build_project.py b/tools/build_project.py index 385766c1..6ff69d84 100755 --- a/tools/build_project.py +++ b/tools/build_project.py @@ -3,6 +3,7 @@ from __future__ import annotations +import os import re import ast import sys @@ -169,9 +170,9 @@ def load_toolchains(paths: list[pathlib.Path]) -> dict[pathlib.Path, str]: return toolchains -def subprocess_run_verbose(command: list[str], prefix: str) -> None: +def subprocess_run_verbose(command: list[str], prefix: str, **kwargs) -> None: with subprocess.Popen( - command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT + command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kwargs ) as proc: for line in proc.stdout: LOGGER.info("[%s] %r", prefix, line.decode("utf-8").strip()) @@ -543,7 +544,10 @@ def main(): f"POST_BUILD_EXE={args.postbuild}", "VERBOSE=1", ], - "make" + "make", + env={ + "PATH": f"{pathlib.Path(sys.executable).parent}:{os.environ['PATH']}" + } ) # fmt: on