Skip to content

Commit f74a693

Browse files
committed
fix: find LLVM by searching for clang++.exe instead of hardcoded paths
1 parent 07d5c86 commit f74a693

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

.github/workflows/ci-windows.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,20 @@ jobs:
7979
run: |
8080
export MCPP_VENDORED_XLINGS="$XLINGS_BIN"
8181
82-
# Pre-seed LLVM into mcpp sandbox from system xlings.
83-
# Needed because: (1) mcpp 0.0.17 bootstrap binary lacks the
84-
# package_fetcher fallback, (2) xlings sandboxed binary has
85-
# an upstream bug with large package extraction on Windows.
82+
# Find where xlings installed LLVM and pre-seed into mcpp sandbox
8683
MCPP_XPKGS="$USERPROFILE/.mcpp/registry/data/xpkgs"
87-
for src in "$USERPROFILE/.xlings/data/xpkgs/xim-x-llvm" \
88-
"$USERPROFILE/.xlings/subos/default/data/xpkgs/xim-x-llvm"; do
89-
if [ -d "$src" ]; then
90-
mkdir -p "$MCPP_XPKGS"
91-
cp -r "$src" "$MCPP_XPKGS/xim-x-llvm"
92-
echo "Pre-seeded LLVM from $src"
93-
break
94-
fi
95-
done
84+
LLVM_SRC=$(find "$USERPROFILE/.xlings" -path "*/xim-x-llvm/20.1.7/bin/clang++.exe" 2>/dev/null | head -1)
85+
if [ -n "$LLVM_SRC" ]; then
86+
# Go up from bin/clang++.exe -> 20.1.7 -> xim-x-llvm
87+
LLVM_VER_DIR=$(dirname "$(dirname "$LLVM_SRC")")
88+
LLVM_PKG_DIR=$(dirname "$LLVM_VER_DIR")
89+
mkdir -p "$MCPP_XPKGS"
90+
cp -r "$LLVM_PKG_DIR" "$MCPP_XPKGS/xim-x-llvm"
91+
echo "Pre-seeded LLVM from $LLVM_PKG_DIR"
92+
else
93+
echo "WARNING: LLVM not found in xlings after install"
94+
find "$USERPROFILE/.xlings" -name "clang++.exe" 2>/dev/null | head -5
95+
fi
9696
9797
"$MCPP" build
9898

0 commit comments

Comments
 (0)