Skip to content

Commit 52a836c

Browse files
Update ci.yml
1 parent 789bef7 commit 52a836c

1 file changed

Lines changed: 7 additions & 18 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -396,33 +396,22 @@ jobs:
396396
shell: bash
397397
run: |
398398
set -e
399+
echo "▶ macOS depends build starting…"
399400
400-
echo "▶ macOS cross-compile build starting…"
401401
echo "▶ Enabling verbose build…"
402402
export V=1
403403
404-
# heartbeat to prevent GitHub timeout
404+
# Heartbeat to stop GitHub from killing long builds
405405
( while true; do echo "❤️ still building mac depends…"; sleep 60; done ) &
406406
407-
echo "▶ Setting macOS-specific compiler variables…"
408-
409-
# These apply ONLY to macOS cross builds, not native Linux tools
410-
export CC="x86_64-apple-darwin11-clang"
411-
export CXX="x86_64-apple-darwin11-clang++"
412-
export CC_FOR_BUILD="gcc" # native Linux compiler for native tools
413-
414-
echo "▶ Building depends (MacOS target: ${{ matrix.host }})…"
407+
echo "▶ Building depends for HOST=${{ matrix.host }}…"
415408
409+
# Use normal Linux compilers for native tools; don't export cross compilers
410+
CC=cc \
411+
CXX=clang++ \
412+
CC_FOR_BUILD=gcc \
416413
make $MAKEJOBS -C depends HOST=${{ matrix.host }}
417414
418-
- name: CCache
419-
uses: actions/cache@v4
420-
env:
421-
cache-name: ccache
422-
with:
423-
path: ~/.ccache
424-
key: ${{ matrix.name }}-${{ env.cache-name }}-${{ hashFiles('**/configure.ac', '.github/workflows/ci.yml') }}
425-
426415
- name: Build AdventureCoin
427416
env:
428417
GIT_COMMIT_ID: ${{ github.sha }}

0 commit comments

Comments
 (0)