## Summary
This PR adds cross-compilation support for three new target platforms,
upgrades LLVM to 21.1.8, and overhauls the CI pipelines around
cross-builds and testing.
## Cross-compilation
New target triples accepted via `-DCLICE_TARGET_TRIPLE=...`:
| Target triple | Host | Output |
|---|---|---|
| `x86_64-apple-darwin` | macos-15 (arm64) | macOS x64 |
| `aarch64-linux-gnu` | ubuntu-24.04 (x64) | Linux arm64 |
| `aarch64-pc-windows-msvc` | windows-2025 (x64) | Windows arm64 |
- `cmake/toolchain.cmake` — maps `CLICE_TARGET_TRIPLE` to
`CMAKE_SYSTEM_NAME`/`CMAKE_SYSTEM_PROCESSOR`/compiler `--target`; picks
up conda aarch64 sysroot when cross-compiling Linux.
- `cmake/llvm.cmake` — forwards target platform/arch to `setup-llvm.py`
so the right prebuilt LLVM is downloaded for the target.
- `CMakeLists.txt` — uses a host-side `flatc` from `PATH` under
`CMAKE_CROSSCOMPILING` instead of the in-tree target build.
- `pixi.toml`:
- Adds `osx-64`, `linux-aarch64`, `win-arm64` platforms.
- New environments: `cross-macos-x64`, `cross-linux-aarch64` (adds
`gcc_linux-aarch64` + `sysroot_linux-aarch64`), `cross-windows-arm64`.
- New lightweight `test-run` env used on native ARM/x64 runners to
execute cross-built artifacts (pulls in upstream clang+lld on macOS so
tests don't fall back to Apple clang).
- `scripts/activate_cross_linux.sh` — exports `CONDA_PREFIX`-relative
paths for the aarch64 toolchain.
- `scripts/build-llvm.py` — `--target-triple` support and a
`build_native_tools()` helper that produces host `llvm-tblgen` /
`clang-tblgen` needed when cross-compiling LLVM itself.
## LLVM upgrade 21.1.4 → 21.1.8
- `cmake/package.cmake` bumps `setup_llvm("21.1.8")`.
- `config/llvm-manifest.json` regenerated with 6 new cross-compiled
entries and a new `arch` field on every entry so lookup is `(version,
platform, arch, lto, build_type)`.
- `scripts/setup-llvm.py` — honours the new `arch` field when resolving
artifacts.
- `scripts/update-llvm-version.py` (new) — single-call version bump
across `package.cmake` + manifest.
- `scripts/validate-llvm-components.py` (new) — scans the LLVM source
tree for library targets and diffs them against
`scripts/llvm-components.json` to catch stale/misspelled component names
before a build.
- `scripts/llvm-components.json` (new) — explicit allow-list of required
LLVM/Clang library targets used by `build-llvm.py`.
## CI changes
- `.github/workflows/build-llvm.yml`:
- Adds `workflow_dispatch` with `llvm_version`, `skip_upload`, `skip_pr`
inputs.
- Matrix extended with the 6 cross-compile entries (2 per new platform:
RelWithDebInfo ± LTO).
- `build clice` / test / prune steps gated on `!matrix.target_triple`
for cross-builds; cross-built LTO entries apply the native prune
manifest (arch-independent).
- Cross-compiled binary architecture is verified with `file(1)`.
- New `upload` job triggered by `workflow_dispatch` pushes artifacts to
`clice-io/clice-llvm` and hands the manifest off to the next job.
- `.github/workflows/test-cmake.yml`:
- Build matrix gains three `build_only: true` cross entries that upload
`bin/` + `lib/` artifacts.
- New `test-cross` job runs on native `macos-15-intel`,
`ubuntu-24.04-arm`, `windows-11-arm` runners, downloads the cross-built
artifacts, and runs unit / integration / smoke tests under the
`test-run` pixi env.
- Cache keys now include `target_triple` so native and cross builds
don't collide.
- `.github/workflows/publish-clice.yml`:
- Three additional release artifacts for the new targets
(`clice-x86_64-macos-darwin`, `clice-aarch64-linux-gnu`,
`clice-aarch64-windows-msvc`), each with a matching `-symbol` archive.
## Compatibility
- All existing native builds and tests are preserved; cross entries are
additive.
- `Debug` + ASAN remains disabled on Windows (`llvm_mode == Debug && os
== windows-*` no longer appends `-asan`).
🤖 Generated with [Claude Code](https://claude.com/claude-code)
---------
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
163 lines
5.0 KiB
Python
Executable File
163 lines
5.0 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
|
|
import argparse
|
|
import json
|
|
import re
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
|
|
def copy_manifest(src: Path, dest: Path) -> None:
|
|
text = src.read_text(encoding="utf-8")
|
|
|
|
try:
|
|
data = json.loads(text)
|
|
except json.JSONDecodeError as err:
|
|
print(f"Error: {src} is not valid JSON: {err}", file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
if not isinstance(data, list) or len(data) == 0:
|
|
print(f"Error: {src} must be a non-empty JSON array", file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
dest.parent.mkdir(parents=True, exist_ok=True)
|
|
with dest.open("w", encoding="utf-8") as handle:
|
|
json.dump(data, handle, indent=2)
|
|
handle.write("\n")
|
|
|
|
print(f"Copied manifest: {src} -> {dest} ({len(data)} entries)")
|
|
|
|
|
|
def update_package_cmake(path: Path, version: str) -> None:
|
|
text = path.read_text(encoding="utf-8")
|
|
|
|
pattern = r'setup_llvm\("[^"]*"\)'
|
|
matches = re.findall(pattern, text)
|
|
|
|
if len(matches) == 0:
|
|
print(f"Error: no setup_llvm(...) call found in {path}", file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
if len(matches) > 1:
|
|
print(
|
|
f"Error: expected exactly 1 setup_llvm(...) call in {path}, "
|
|
f"found {len(matches)}",
|
|
file=sys.stderr,
|
|
)
|
|
sys.exit(1)
|
|
|
|
old_call = matches[0]
|
|
new_call = f'setup_llvm("{version}")'
|
|
|
|
if old_call == new_call:
|
|
print(f"Version in {path} is already {version}, no change needed")
|
|
return
|
|
|
|
updated = text.replace(old_call, new_call)
|
|
path.write_text(updated, encoding="utf-8")
|
|
print(f"Updated {path}: {old_call} -> {new_call}")
|
|
|
|
|
|
def check_package_cmake(path: Path) -> None:
|
|
"""Verify package.cmake has exactly one setup_llvm(...) call that the
|
|
update script can rewrite. Used by CI to catch drift before the next bump."""
|
|
text = path.read_text(encoding="utf-8")
|
|
matches = re.findall(r'setup_llvm\("[^"]*"\)', text)
|
|
if len(matches) == 0:
|
|
print(f"Error: no setup_llvm(...) call found in {path}", file=sys.stderr)
|
|
sys.exit(1)
|
|
if len(matches) > 1:
|
|
print(
|
|
f"Error: expected exactly 1 setup_llvm(...) call in {path}, "
|
|
f"found {len(matches)}: {matches}",
|
|
file=sys.stderr,
|
|
)
|
|
sys.exit(1)
|
|
print(f"OK: {path} has a single setup_llvm(...) call: {matches[0]}")
|
|
|
|
|
|
def check_manifest(path: Path) -> None:
|
|
"""Verify the manifest is a well-formed non-empty array with required fields."""
|
|
try:
|
|
data = json.loads(path.read_text(encoding="utf-8"))
|
|
except json.JSONDecodeError as err:
|
|
print(f"Error: {path} is not valid JSON: {err}", file=sys.stderr)
|
|
sys.exit(1)
|
|
if not isinstance(data, list) or len(data) == 0:
|
|
print(f"Error: {path} must be a non-empty JSON array", file=sys.stderr)
|
|
sys.exit(1)
|
|
required = ("version", "platform", "arch", "build_type", "filename", "sha256")
|
|
for idx, entry in enumerate(data):
|
|
missing = [k for k in required if k not in entry]
|
|
if missing:
|
|
print(
|
|
f"Error: {path} entry {idx} is missing fields: {missing}",
|
|
file=sys.stderr,
|
|
)
|
|
sys.exit(1)
|
|
print(f"OK: {path} has {len(data)} well-formed entries")
|
|
|
|
|
|
def main() -> None:
|
|
parser = argparse.ArgumentParser(
|
|
description="Update LLVM version references in the clice project."
|
|
)
|
|
parser.add_argument(
|
|
"--check",
|
|
action="store_true",
|
|
help="Validate existing state without modifying files (for CI drift checks)",
|
|
)
|
|
parser.add_argument(
|
|
"--version",
|
|
help="New LLVM version string (e.g. 21.2.0); required unless --check",
|
|
)
|
|
parser.add_argument(
|
|
"--manifest-src",
|
|
help="Path to the source llvm-manifest.json; required unless --check",
|
|
)
|
|
parser.add_argument(
|
|
"--manifest-dest",
|
|
required=True,
|
|
help="Path to destination manifest (e.g. config/llvm-manifest.json)",
|
|
)
|
|
parser.add_argument(
|
|
"--package-cmake",
|
|
required=True,
|
|
help="Path to cmake/package.cmake",
|
|
)
|
|
args = parser.parse_args()
|
|
|
|
manifest_dest = Path(args.manifest_dest)
|
|
package_cmake = Path(args.package_cmake)
|
|
|
|
if not package_cmake.is_file():
|
|
print(f"Error: package.cmake not found: {package_cmake}", file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
if args.check:
|
|
check_package_cmake(package_cmake)
|
|
check_manifest(manifest_dest)
|
|
print("Done (check mode).")
|
|
return
|
|
|
|
if not args.version or not args.manifest_src:
|
|
print(
|
|
"Error: --version and --manifest-src are required unless --check is set",
|
|
file=sys.stderr,
|
|
)
|
|
sys.exit(1)
|
|
|
|
manifest_src = Path(args.manifest_src)
|
|
if not manifest_src.is_file():
|
|
print(f"Error: manifest source not found: {manifest_src}", file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
copy_manifest(manifest_src, manifest_dest)
|
|
update_package_cmake(package_cmake, args.version)
|
|
|
|
print("Done.")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|