Skip to content

Commit a06096f

Browse files
Update ci.yml
1 parent e8ee9c9 commit a06096f

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,16 +400,27 @@ jobs:
400400
401401
export V=1
402402
403-
# Prevent timeout
403+
# Keep runner alive
404404
( while true; do echo "❤️ still building mac depends…"; sleep 60; done ) &
405405
406-
echo "▶ Adding real Darwin clang toolchain to PATH…"
407-
export PATH="$(pwd)/depends/x86_64-apple-darwin11/native/bin:$PATH"
406+
TOOLCHAIN_DIR="$(pwd)/depends/x86_64-apple-darwin11/native/bin"
408407
409-
echo "Using clang at: $(which clang)"
410-
echo "Using clang++ at: $(which clang++)"
408+
echo "Using Darwin toolchain from: $TOOLCHAIN_DIR"
409+
ls -l "$TOOLCHAIN_DIR"
411410
412-
echo "▶ Building macOS depends with HOST=x86_64-apple-darwin11…"
411+
export PATH="$TOOLCHAIN_DIR:$PATH"
412+
413+
# FORCE depends to use the correct Darwin toolchain compiler
414+
export CC="$TOOLCHAIN_DIR/clang"
415+
export CXX="$TOOLCHAIN_DIR/clang++"
416+
export AR="$TOOLCHAIN_DIR/x86_64-apple-darwin11-ar"
417+
export RANLIB="$TOOLCHAIN_DIR/x86_64-apple-darwin11-ranlib"
418+
export STRIP="$TOOLCHAIN_DIR/x86_64-apple-darwin11-strip"
419+
420+
echo "▶ CC = $CC"
421+
echo "▶ CXX = $CXX"
422+
423+
echo "▶ Building macOS depends…"
413424
make $MAKEJOBS -C depends HOST=x86_64-apple-darwin11
414425
415426
- name: Build AdventureCoin

0 commit comments

Comments
 (0)