## 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>
132 lines
5.1 KiB
CMake
132 lines
5.1 KiB
CMake
include_guard()
|
|
|
|
function(setup_llvm LLVM_VERSION)
|
|
find_package(Python3 COMPONENTS Interpreter REQUIRED)
|
|
|
|
set(LLVM_SETUP_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/.llvm/setup-llvm.json")
|
|
set(LLVM_SETUP_SCRIPT "${PROJECT_SOURCE_DIR}/scripts/setup-llvm.py")
|
|
set(LLVM_SETUP_ARGS
|
|
"--version" "${LLVM_VERSION}"
|
|
"--build-type" "${CMAKE_BUILD_TYPE}"
|
|
"--binary-dir" "${CMAKE_CURRENT_BINARY_DIR}"
|
|
"--manifest" "${PROJECT_SOURCE_DIR}/config/llvm-manifest.json"
|
|
"--output" "${LLVM_SETUP_OUTPUT}"
|
|
)
|
|
|
|
if(CLICE_ENABLE_LTO)
|
|
list(APPEND LLVM_SETUP_ARGS "--enable-lto")
|
|
endif()
|
|
|
|
if(DEFINED LLVM_INSTALL_PATH AND NOT LLVM_INSTALL_PATH STREQUAL "")
|
|
list(APPEND LLVM_SETUP_ARGS "--install-path" "${LLVM_INSTALL_PATH}")
|
|
endif()
|
|
|
|
if(DEFINED CLICE_OFFLINE_BUILD AND CLICE_OFFLINE_BUILD)
|
|
list(APPEND LLVM_SETUP_ARGS "--offline")
|
|
endif()
|
|
|
|
if(DEFINED CLICE_TARGET_TRIPLE)
|
|
if(CLICE_TARGET_TRIPLE MATCHES "linux")
|
|
list(APPEND LLVM_SETUP_ARGS "--target-platform" "Linux")
|
|
elseif(CLICE_TARGET_TRIPLE MATCHES "darwin")
|
|
list(APPEND LLVM_SETUP_ARGS "--target-platform" "macosx")
|
|
elseif(CLICE_TARGET_TRIPLE MATCHES "windows")
|
|
list(APPEND LLVM_SETUP_ARGS "--target-platform" "Windows")
|
|
endif()
|
|
|
|
if(CLICE_TARGET_TRIPLE MATCHES "^aarch64")
|
|
list(APPEND LLVM_SETUP_ARGS "--target-arch" "arm64")
|
|
elseif(CLICE_TARGET_TRIPLE MATCHES "^x86_64")
|
|
list(APPEND LLVM_SETUP_ARGS "--target-arch" "x64")
|
|
endif()
|
|
endif()
|
|
|
|
execute_process(
|
|
COMMAND "${Python3_EXECUTABLE}" "${LLVM_SETUP_SCRIPT}" ${LLVM_SETUP_ARGS}
|
|
RESULT_VARIABLE LLVM_SETUP_RESULT
|
|
OUTPUT_VARIABLE LLVM_SETUP_STDOUT
|
|
ERROR_VARIABLE LLVM_SETUP_STDERR
|
|
ECHO_OUTPUT_VARIABLE
|
|
ECHO_ERROR_VARIABLE
|
|
COMMAND_ERROR_IS_FATAL ANY
|
|
)
|
|
|
|
file(READ "${LLVM_SETUP_OUTPUT}" LLVM_SETUP_JSON)
|
|
string(JSON LLVM_INSTALL_PATH GET "${LLVM_SETUP_JSON}" install_path)
|
|
string(JSON LLVM_CMAKE_DIR GET "${LLVM_SETUP_JSON}" cmake_dir)
|
|
set(LLVM_INSTALL_PATH "${LLVM_INSTALL_PATH}" CACHE PATH "Path to LLVM installation" FORCE)
|
|
set(LLVM_CMAKE_DIR "${LLVM_CMAKE_DIR}" CACHE PATH "Path to LLVM CMake files" FORCE)
|
|
|
|
get_filename_component(LLVM_INSTALL_PATH "${LLVM_INSTALL_PATH}" ABSOLUTE)
|
|
|
|
if(NOT EXISTS "${LLVM_INSTALL_PATH}")
|
|
message(FATAL_ERROR "Error: The specified LLVM_INSTALL_PATH does not exist: ${LLVM_INSTALL_PATH}")
|
|
endif()
|
|
|
|
# set llvm include and lib path
|
|
add_library(llvm-libs INTERFACE IMPORTED)
|
|
|
|
# add to include directories
|
|
target_include_directories(llvm-libs INTERFACE "${LLVM_INSTALL_PATH}/include")
|
|
|
|
if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT WIN32)
|
|
target_link_directories(llvm-libs INTERFACE "${LLVM_INSTALL_PATH}/lib")
|
|
target_link_libraries(llvm-libs INTERFACE
|
|
LLVMSupport
|
|
LLVMFrontendOpenMP
|
|
LLVMOption
|
|
LLVMTargetParser
|
|
clangAST
|
|
clangASTMatchers
|
|
clangBasic
|
|
clangDriver
|
|
clangFormat
|
|
clangFrontend
|
|
clangLex
|
|
clangSema
|
|
clangSerialization
|
|
clangTidy
|
|
clangTidyUtils
|
|
clangTidyAndroidModule
|
|
clangTidyAbseilModule
|
|
clangTidyAlteraModule
|
|
clangTidyBoostModule
|
|
clangTidyBugproneModule
|
|
clangTidyCERTModule
|
|
clangTidyConcurrencyModule
|
|
clangTidyCppCoreGuidelinesModule
|
|
clangTidyDarwinModule
|
|
clangTidyFuchsiaModule
|
|
clangTidyGoogleModule
|
|
clangTidyHICPPModule
|
|
clangTidyLinuxKernelModule
|
|
clangTidyLLVMModule
|
|
clangTidyLLVMLibcModule
|
|
clangTidyMiscModule
|
|
clangTidyModernizeModule
|
|
clangTidyObjCModule
|
|
clangTidyOpenMPModule
|
|
clangTidyPerformanceModule
|
|
clangTidyPortabilityModule
|
|
clangTidyReadabilityModule
|
|
clangTidyZirconModule
|
|
clangTooling
|
|
clangToolingCore
|
|
clangToolingInclusions
|
|
clangToolingInclusionsStdlib
|
|
clangToolingSyntax
|
|
)
|
|
else()
|
|
file(GLOB LLVM_LIBRARIES CONFIGURE_DEPENDS "${LLVM_INSTALL_PATH}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVM[a-zA-Z]*${CMAKE_STATIC_LIBRARY_SUFFIX}")
|
|
file(GLOB CLANG_LIBRARIES CONFIGURE_DEPENDS "${LLVM_INSTALL_PATH}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}clang[a-zA-Z]*${CMAKE_STATIC_LIBRARY_SUFFIX}")
|
|
# TODO: find a better way to find out whether zlib and zstd are needed
|
|
# Currently link if present in the LLVM lib directory
|
|
file(GLOB OTHER_REQUIRED_LIBS CONFIGURE_DEPENDS
|
|
"${LLVM_INSTALL_PATH}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}z${CMAKE_STATIC_LIBRARY_SUFFIX}"
|
|
"${LLVM_INSTALL_PATH}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}zstd${CMAKE_STATIC_LIBRARY_SUFFIX}"
|
|
)
|
|
target_link_libraries(llvm-libs INTERFACE ${LLVM_LIBRARIES} ${CLANG_LIBRARIES} ${OTHER_REQUIRED_LIBS})
|
|
target_compile_definitions(llvm-libs INTERFACE CLANG_BUILD_STATIC=1)
|
|
endif()
|
|
endfunction()
|