Skip to content

Commit ddbbb04

Browse files
Update ci.yml
1 parent 9720623 commit ddbbb04

1 file changed

Lines changed: 14 additions & 28 deletions

File tree

.github/workflows/ci.yml

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -391,40 +391,26 @@ jobs:
391391
if: matrix.name != 'x86_64-macos'
392392
run: make $MAKEJOBS -C depends HOST=${{ matrix.host }} ${{ matrix.dep-opts }}
393393

394-
- name: Patch OpenSSL build tree (nukes remaining clang)
395-
if: matrix.name == 'x86_64-macos'
396-
run: |
397-
echo "🔧 Patching OpenSSL build tree…"
398-
399-
find depends/work/build -path "*/openssl*/Makefile" -exec sed -i \
400-
-e "s/^CC=.*/CC=ccmac/" \
401-
-e "s/clang/ccmac/g" \
402-
{} \; || true
403-
404-
find depends/work/build -path "*/openssl*/crypto/*/Makefile" -exec sed -i \
405-
-e "s/^CC=.*/CC=ccmac/" \
406-
-e "s/clang/ccmac/g" \
407-
{} \; || true
408-
409-
find depends/work/build -path "*/openssl*/ssl/*/Makefile" -exec sed -i \
410-
-e "s/^CC=.*/CC=ccmac/" \
411-
-e "s/clang/ccmac/g" \
412-
{} \; || true
413-
414-
find depends/work/build -path "*/openssl*/util/domd" -exec sed -i \
415-
-e "s/CC=.*/CC=ccmac/" \
416-
-e "s/clang/ccmac/g" \
417-
{} \; || true
418-
419-
echo "Build tree patched ✔"
420-
421394
- name: Build depends (macOS)
422395
if: matrix.name == 'x86_64-macos'
423396
shell: bash
424397
run: |
425398
set -e
426-
echo "▶ First build attempt (with stealth patches)…"
399+
echo "▶ Setting global compiler override…"
400+
401+
mkdir -p fakebin
402+
cat <<'EOF' > fakebin/ccmac
403+
#!/bin/bash
404+
exec x86_64-apple-darwin11-clang "$@"
405+
EOF
406+
chmod +x fakebin/ccmac
407+
408+
export PATH="$(pwd)/fakebin:$PATH"
427409
410+
echo "▶ Building depends with forced compiler override…"
411+
CC=ccmac \
412+
CXX=ccmac \
413+
CC_FOR_BUILD=ccmac \
428414
make $MAKEJOBS -C depends HOST=${{ matrix.host }}
429415
430416
- name: CCache

0 commit comments

Comments
 (0)