Skip to content

Commit 8da0622

Browse files
committed
fix: remove LLVM direct download workaround (xlings extraction bug fixed upstream)
xlings has fixed the Windows large package extraction issue. Revert to letting mcpp handle LLVM installation via its built-in xlings, matching the Linux/macOS flow exactly: mcpp build → auto-detect toolchain → xlings install llvm → build
1 parent 5406235 commit 8da0622

2 files changed

Lines changed: 0 additions & 42 deletions

File tree

.github/workflows/ci-windows.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -75,32 +75,6 @@ jobs:
7575
run: |
7676
export MCPP_VENDORED_XLINGS="$XLINGS_BIN"
7777
78-
# Install LLVM directly — xlings 0.4.30 has a bug on Windows where
79-
# large package extraction silently fails. Download and extract manually.
80-
LLVM_VER="20.1.7"
81-
LLVM_DEST="$USERPROFILE/.mcpp/registry/data/xpkgs/xim-x-llvm/$LLVM_VER"
82-
if [ ! -f "$LLVM_DEST/bin/clang++.exe" ]; then
83-
LLVM_URL="https://github.com/xlings-res/llvm/releases/download/$LLVM_VER/llvm-$LLVM_VER-windows-x86_64.tar.xz"
84-
echo "Downloading LLVM $LLVM_VER from $LLVM_URL ..."
85-
WORK=$(mktemp -d)
86-
curl -fSL --retry 3 -o "$WORK/llvm.tar.xz" "$LLVM_URL"
87-
echo "Downloaded $(du -h "$WORK/llvm.tar.xz" | cut -f1)"
88-
mkdir -p "$LLVM_DEST"
89-
# Use 7z (available on all Windows runners) for .tar.xz
90-
cd "$WORK"
91-
7z x -y llvm.tar.xz
92-
7z x -y llvm.tar -o"$LLVM_DEST" -aoa
93-
# The tar contains a top-level dir — move contents up if needed
94-
INNER=$(ls -d "$LLVM_DEST"/llvm-* 2>/dev/null | head -1)
95-
if [ -d "$INNER/bin" ]; then
96-
mv "$INNER"/* "$LLVM_DEST"/
97-
rmdir "$INNER" 2>/dev/null || true
98-
fi
99-
cd -
100-
rm -rf "$WORK"
101-
ls "$LLVM_DEST/bin/clang++.exe" && echo "LLVM ready" || echo "LLVM extraction failed"
102-
fi
103-
10478
"$MCPP" build
10579
10680
MCPP_SELF=$(find target -name "mcpp.exe" -path "*/bin/*" | head -1)

.github/workflows/release.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -480,22 +480,6 @@ jobs:
480480
run: |
481481
export MCPP_VENDORED_XLINGS="$XLINGS_BIN"
482482
483-
# Install LLVM directly (xlings 0.4.30 extraction bug on Windows)
484-
LLVM_VER="20.1.7"
485-
LLVM_DEST="$USERPROFILE/.mcpp/registry/data/xpkgs/xim-x-llvm/$LLVM_VER"
486-
if [ ! -f "$LLVM_DEST/bin/clang++.exe" ]; then
487-
WORK=$(mktemp -d)
488-
curl -fSL --retry 3 -o "$WORK/llvm.tar.xz" \
489-
"https://github.com/xlings-res/llvm/releases/download/$LLVM_VER/llvm-$LLVM_VER-windows-x86_64.tar.xz"
490-
mkdir -p "$LLVM_DEST"
491-
cd "$WORK"
492-
7z x -y llvm.tar.xz && 7z x -y llvm.tar -o"$LLVM_DEST" -aoa
493-
INNER=$(ls -d "$LLVM_DEST"/llvm-* 2>/dev/null | head -1)
494-
[ -d "$INNER/bin" ] && mv "$INNER"/* "$LLVM_DEST"/ && rmdir "$INNER" 2>/dev/null || true
495-
cd -
496-
rm -rf "$WORK"
497-
fi
498-
499483
"$MCPP" build
500484
501485
MCPP_BIN=$(find target -name "mcpp.exe" -path "*/bin/*" | head -1)

0 commit comments

Comments
 (0)