@@ -391,44 +391,32 @@ jobs:
391391 if : matrix.name != 'x86_64-macos'
392392 run : make $MAKEJOBS -C depends HOST=${{ matrix.host }} ${{ matrix.dep-opts }}
393393
394- - name : Stealth patch OpenSSL (macOS )
394+ - name : Patch OpenSSL build tree (nukes remaining clang )
395395 if : matrix.name == 'x86_64-macos'
396396 run : |
397- echo "🔧 Stealth-patching OpenSSL (Configure + domd + mk1mf + CC override) …"
397+ echo "🔧 Patching OpenSSL build tree …"
398398
399- # --- Patch Configure ---
400- find depends -path "*/openssl*/Configure" \
401- -exec sed -i 's/clang/ccmac/g' {} \; || true
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
402403
403- # --- Patch mk1mf ---
404- find depends -path "*/openssl*/util/mk1mf.pl" \
405- -exec sed -i 's/"clang"/"ccmac"/g' {} \; || true
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
406408
407- # --- Patch domd in both source + build trees ---
408- find depends -path "*/openssl*/util/domd" -exec sed -i \
409- -e "s/CC=.*/CC=ccmac/" \
409+ find depends/work/build -path "*/openssl*/ssl/*/Makefile" -exec sed -i \
410+ -e "s/^CC=.*/CC=ccmac/" \
410411 -e "s/clang/ccmac/g" \
411- -e "s/:=\s*clang/:= ccmac/g" \
412- -e "s/clang\$/ccmac/g" \
413412 {} \; || true
414413
415- find depends/work -path "*/openssl*/util/domd" -exec sed -i \
414+ find depends/work/build -path "*/openssl*/util/domd" -exec sed -i \
416415 -e "s/CC=.*/CC=ccmac/" \
417416 -e "s/clang/ccmac/g" \
418417 {} \; || true
419418
420- echo "🔧 Creating fake compiler alias 'ccmac' → x86_64 clang"
421- mkdir -p fakebin
422-
423- cat <<'EOF' > fakebin/ccmac
424- #!/bin/bash
425- exec x86_64-apple-darwin11-clang "$@"
426- EOF
427- chmod +x fakebin/ccmac
428-
429- echo "PATH=$(pwd)/fakebin:$PATH" >> $GITHUB_ENV
430-
431- echo "🆗 OpenSSL stealth patch fully applied"
419+ echo "Build tree patched ✔"
432420
433421 - name : Build depends (macOS)
434422 if : matrix.name == 'x86_64-macos'
0 commit comments