rosa/hakurei
6
3
Fork 2
Code Issues 12 Pull Requests 2 Actions 2 Packages Projects Releases 15 Wiki Activity

internal/rosa/llvm: enable cross compilation
All checks were successful
Test / Create distribution (push) Successful in 2m16s
Details
Test / ShareFS (push) Successful in 14m13s
Details
Test / Sandbox (push) Successful in 4m24s
Details
Test / Sandbox (race detector) (push) Successful in 5m48s
Details
Test / Hakurei (push) Successful in 10m2s
Details
Test / Hakurei (race detector) (push) Successful in 7m42s
Details
Test / Flake checks (push) Successful in 1m44s
Details

Browse Source 
This now passes the test suite.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2026-04-10 00:59:14 +09:00
parent 6f924336fc
commit e9c890cbb2
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/rosa/llvm.go
View File

@@ -216,7 +216,8 @@ index 9da357a7ebb9..b2931510c1ae 100644
// newLLVM returns LLVM toolchain across multiple [pkg.Artifact]. // newLLVM returns LLVM toolchain across multiple [pkg.Artifact].
func (t Toolchain) newLLVM() (musl, compilerRT, runtimes, clang pkg.Artifact) { func (t Toolchain) newLLVM() (musl, compilerRT, runtimes, clang pkg.Artifact) {
var target string target := "'AArch64;RISCV;X86'"
if t.isStage0() {
switch runtime.GOARCH { switch runtime.GOARCH {
case "386", "amd64": case "386", "amd64":
target = "X86" target = "X86"
@@ -228,6 +229,7 @@ func (t Toolchain) newLLVM() (musl, compilerRT, runtimes, clang pkg.Artifact) {
default: default:
panic("unsupported target " + runtime.GOARCH) panic("unsupported target " + runtime.GOARCH)
} }
}
minimalDeps := []KV{ minimalDeps := []KV{
{"LLVM_ENABLE_ZLIB", "OFF"}, {"LLVM_ENABLE_ZLIB", "OFF"},
@@ -248,7 +250,7 @@ func (t Toolchain) newLLVM() (musl, compilerRT, runtimes, clang pkg.Artifact) {
{"CMAKE_CXX_COMPILER_TARGET", ""}, {"CMAKE_CXX_COMPILER_TARGET", ""},
{"COMPILER_RT_BUILD_BUILTINS", "ON"}, {"COMPILER_RT_BUILD_BUILTINS", "ON"},
{"COMPILER_RT_DEFAULT_TARGET_ONLY", "ON"}, {"COMPILER_RT_DEFAULT_TARGET_ONLY", "OFF"},
{"COMPILER_RT_SANITIZERS_TO_BUILD", "asan"}, {"COMPILER_RT_SANITIZERS_TO_BUILD", "asan"},
{"LLVM_ENABLE_PER_TARGET_RUNTIME_DIR", "ON"}, {"LLVM_ENABLE_PER_TARGET_RUNTIME_DIR", "ON"},