Skip to content

Commit c64de5f

Browse files
Update ci.yml
1 parent 3002d46 commit c64de5f

1 file changed

Lines changed: 17 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -400,19 +400,30 @@ jobs:
400400
401401
export V=1
402402
403-
# Prevent GitHub timeout on long mac builds
403+
# Prevent GitHub timeout
404404
( while true; do echo "❤️ still building mac depends…"; sleep 60; done ) &
405405
406-
echo "▶ Adding temporary clang shim for OpenSSL domd script…"
406+
echo "▶ Locating system clang…"
407+
REAL_CLANG=$(command -v clang || true)
408+
if [ -z "$REAL_CLANG" ]; then
409+
# fallback for GitHub Ubuntu runners
410+
REAL_CLANG=$(command -v clang-15 || command -v clang-14 || command -v clang-13)
411+
fi
412+
echo "Using REAL_CLANG=$REAL_CLANG"
413+
414+
if [ ! -x "$REAL_CLANG" ]; then
415+
echo "❌ No clang compiler found!"
416+
exit 1
417+
fi
418+
419+
echo "▶ Creating clang shim for OpenSSL domd script…"
407420
mkdir -p fakeclang
408-
cat <<'EOF' > fakeclang/clang
421+
cat <<EOF > fakeclang/clang
409422
#!/bin/bash
410-
# Use system clang with macOS target flags added later by darwin.mk
411-
exec /usr/bin/clang "$@"
423+
exec "$REAL_CLANG" "\$@"
412424
EOF
413425
chmod +x fakeclang/clang
414426
415-
# Inject shim into PATH so OpenSSL can find "clang"
416427
export PATH="$(pwd)/fakeclang:$PATH"
417428
418429
echo "▶ Running depends build…"

0 commit comments

Comments
 (0)