Skip to content

Commit b1b872d

Browse files
committed
fix(ci-macos): add MCPP_HOME env and MCPP_VENDORED_XLINGS for test step
macOS CI was missing the MCPP_HOME job-level env var that Linux CI has. The freshly-built mcpp resolved to a fresh ~/.mcpp/ sandbox, triggering a clean std module precompile that exposed a pre-existing Xcode 16.4 + LLVM 20.1.7 sysroot incompatibility. Fix: set MCPP_HOME=/Users/runner/.mcpp (consistent with Linux CI) and export MCPP_VENDORED_XLINGS in the test step so the sandbox reuses the pre-installed xlings binary.
1 parent 7e9a020 commit b1b872d

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

.github/workflows/ci-macos.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
name: macOS ARM64 — xlings LLVM end-to-end
2020
runs-on: macos-15
2121
timeout-minutes: 30
22+
env:
23+
MCPP_HOME: /Users/runner/.mcpp
2224
steps:
2325
- uses: actions/checkout@v4
2426

@@ -285,9 +287,12 @@ jobs:
285287
286288
- name: Unit + integration tests via `mcpp test`
287289
run: |
288-
# Use freshly-built mcpp (has --mirror support)
290+
# Use freshly-built mcpp with the shared sandbox (MCPP_HOME set
291+
# via job-level env). MCPP_VENDORED_XLINGS ensures the sandbox
292+
# uses the pre-installed xlings binary.
289293
MCPP=$(find target -path "*/bin/mcpp" | head -1)
290294
MCPP=$(cd "$(dirname "$MCPP")" && pwd)/$(basename "$MCPP")
295+
export MCPP_VENDORED_XLINGS="$XLINGS_BIN"
291296
"$MCPP" self config --mirror GLOBAL
292297
"$MCPP" test
293298

0 commit comments

Comments
 (0)