Page MenuHomeFreeBSD
Files F148634497

D51653.1787807807.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D51653.1787807807.diff
View Options

diff --git a/tools/build/make.py b/tools/build/make.py
--- a/tools/build/make.py
+++ b/tools/build/make.py
@@ -40,6 +40,7 @@
# --cross-bindir=/path/to/cross/compiler buildworld -DWITH_FOO TARGET=foo
# TARGET_ARCH=bar`
import argparse
+import functools
import os
import shlex
import shutil
@@ -178,24 +179,41 @@
return
global parsed_args
if parsed_args.cross_bindir is None:
- parsed_args.cross_bindir = default_cross_toolchain()
+ cross_bindir = default_cross_toolchain(binary_name)
+ else:
+ cross_bindir = parsed_args.cross_bindir
return check_required_make_env_var(varname, binary_name,
- parsed_args.cross_bindir)
+ cross_bindir)
+
+
+@functools.cache
+def brew_prefix(package: str) -> str:
+ path = subprocess.run(["brew", "--prefix", package], stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE).stdout.strip()
+ debug("Inferred", package, "dir as", path)
+ return path.decode("utf-8")
+def binary_path(bindir: str, binary_name: str) -> "Optional[str]":
+ try:
+ if bindir and Path(bindir, "bin", binary_name).exists():
+ return str(Path(bindir, "bin"))
+ except OSError:
+ pass
+ return None
-def default_cross_toolchain():
+def default_cross_toolchain(binary_name: str) -> str:
# 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"],
- 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():
- return str(Path(llvm_dir.decode("utf-8"), "bin"))
- except OSError:
- return None
+ bindir = binary_path(brew_prefix("llvm"), binary_name)
+ if bindir:
+ return bindir
+
+ # brew installs lld as a separate package for LLVM 19 and later
+ if binary_name == "ld.lld":
+ bindir = binary_path(brew_prefix("lld"), binary_name)
+ if bindir:
+ return bindir
return None

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 27, 5:16 AM (6 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29471340
Default Alt Text
D51653.1787807807.diff (2 KB)

Event Timeline