The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ad43e7f4721080caedd29a21de9210f9b763ee4d
commit ad43e7f4721080caedd29a21de9210f9b763ee4d
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2025-08-06 20:14:37 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2025-08-06 20:14:37 +0000
.github: Use make.py's --cross-toolchain option on macOS
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D51749
---
.github/workflows/cross-bootstrap-tools.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/cross-bootstrap-tools.yml
b/.github/workflows/cross-bootstrap-tools.yml
index 540e05cbd6e2..8f0dd933ef09 100644
--- a/.github/workflows/cross-bootstrap-tools.yml
+++ b/.github/workflows/cross-bootstrap-tools.yml
@@ -31,7 +31,7 @@ jobs:
pkgs: bmake libarchive-dev clang-18 lld-18
- os: macos-latest
compiler: clang-18
- cross-bindir: /opt/homebrew/opt/llvm@18/bin
+ cross-toolchain: llvm@18
pkgs: bmake libarchive llvm@18
- target_arch: amd64
target: amd64
@@ -55,6 +55,9 @@ jobs:
if [ -n "${{ matrix.cross-bindir }}" ]; then
echo "EXTRA_BUILD_ARGS=--cross-bindir=${{ matrix.cross-bindir }}"
>> $GITHUB_ENV
fi
+ if [ -n "${{ matrix.cross-toolchain }}" ]; then
+ echo "EXTRA_BUILD_ARGS=--cross-toolchain=${{
matrix.cross-toolchain }}" >> $GITHUB_ENV
+ fi
mkdir -p ../build
echo "MAKEOBJDIRPREFIX=${PWD%/*}/build" >> $GITHUB_ENV
# heh, works on Linux/BSD/macOS ...
