jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-27 13:32:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

tools/build/make.py: Avoid Python 3.7+ subprocess.run capture_output

Browse Source 
This is just a convenient alias for setting stdout and stderr to PIPE,
so substitute it for that to be compatible with Python 3.6.

Fixes:	69cfdc81ea ("tools/build/make.py: Keep bootstrapped bmake binary up-to-date")
This commit is contained in:
Jessica Clarke 2024-01-31 19:45:59 +00:00
parent 81bee6d793
commit b771d5705f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/build/make.py
View File

@ -81,8 +81,8 @@ def bootstrap_bmake(source_root, objdir_prefix):
bmake_config = bmake_install_dir / ".make-py-config"
bmake_source_version = subprocess.run([
"sh", "-c", ". \"$0\"/VERSION; echo $_MAKE_VERSION",
bmake_source_dir], capture_output=True).stdout.strip()
"sh", "-c", ". \"$0\"/VERSION; echo $_MAKE_VERSION", bmake_source_dir],
stdout=subprocess.PIPE, stderr=subprocess.PIPE).stdout.strip()
try:
bmake_source_version = int(bmake_source_version)
except ValueError:
@ -92,7 +92,7 @@ def bootstrap_bmake(source_root, objdir_prefix):
if bmake_binary.exists():
bmake_installed_version = subprocess.run([
bmake_binary, "-r", "-f", "/dev/null", "-V", "MAKE_VERSION"],
capture_output=True).stdout.strip()
stdout=subprocess.PIPE, stderr=subprocess.PIPE).stdout.strip()
try:
bmake_installed_version = int(bmake_installed_version.strip())
except ValueError:
@ -187,8 +187,9 @@ def default_cross_toolchain():
# default to homebrew-installed clang on MacOS if available
if sys.platform.startswith("darwin"):
if shutil.which("brew"):
llvm_dir = subprocess.run(["brew", "--prefix", "llvm"],
capture_output=True).stdout.strip()
llvm_dir = subprocess.run([
"brew", "--prefix", "llvm"],
stdout=subprocess.PIPE, stderr=subprocess.PIPE).stdout.strip()
debug("Inferred LLVM dir as", llvm_dir)
try:
if llvm_dir and Path(llvm_dir.decode("utf-8"), "bin").exists():