Skip to content

Commit 8b59e5d

Browse files
Update ci.yml
1 parent 95ad278 commit 8b59e5d

1 file changed

Lines changed: 19 additions & 11 deletions

File tree

.github/workflows/ci.yml

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -391,36 +391,44 @@ 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 only)
394+
- name: Stealth patch OpenSSL (macOS)
395395
if: matrix.name == 'x86_64-macos'
396-
shell: bash
397396
run: |
398-
echo "🔧 Stealth patch: Configure, domd, mk1mf (clang → ccmac)…"
397+
echo "🔧 Stealth-patching OpenSSL (Configure + domd + mk1mf + CC override)…"
399398
400-
# 1. Patch Configure (THIS is the missing patch)
399+
# --- Patch Configure ---
401400
find depends -path "*/openssl*/Configure" \
402401
-exec sed -i 's/clang/ccmac/g' {} \; || true
403402
404-
# 2. Patch domd
405-
find depends -path "*/openssl*/util/domd" \
406-
-exec sed -i 's/clang/ccmac/g' {} \; || true
407-
408-
# 3. Patch mk1mf
403+
# --- Patch mk1mf ---
409404
find depends -path "*/openssl*/util/mk1mf.pl" \
410405
-exec sed -i 's/"clang"/"ccmac"/g' {} \; || true
411406
407+
# --- Patch domd in both source + build trees ---
408+
find depends -path "*/openssl*/util/domd" -exec sed -i \
409+
-e "s/CC=.*/CC=ccmac/" \
410+
-e "s/clang/ccmac/g" \
411+
-e "s/:=\s*clang/:= ccmac/g" \
412+
-e "s/clang\$/ccmac/g" \
413+
{} \; || true
414+
415+
find depends/work -path "*/openssl*/util/domd" -exec sed -i \
416+
-e "s/CC=.*/CC=ccmac/" \
417+
-e "s/clang/ccmac/g" \
418+
{} \; || true
419+
412420
echo "🔧 Creating fake compiler alias 'ccmac' → x86_64 clang"
413421
mkdir -p fakebin
414422
415423
cat <<'EOF' > fakebin/ccmac
416424
#!/bin/bash
417425
exec x86_64-apple-darwin11-clang "$@"
418426
EOF
419-
420427
chmod +x fakebin/ccmac
421428
422429
echo "PATH=$(pwd)/fakebin:$PATH" >> $GITHUB_ENV
423-
echo "🆗 Stealth patch applied (Configure + domd + mk1mf masked)"
430+
431+
echo "🆗 OpenSSL stealth patch fully applied"
424432
425433
- name: Build depends (macOS)
426434
if: matrix.name == 'x86_64-macos'

0 commit comments

Comments
 (0)