diff options
| -rw-r--r-- | internal/rosa/llvm.go | 8 | ||||
| -rw-r--r-- | internal/rosa/llvm_arm64.go | 8 | ||||
| -rw-r--r-- | internal/rosa/llvm_latest.go | 11 |
3 files changed, 20 insertions, 7 deletions
diff --git a/internal/rosa/llvm.go b/internal/rosa/llvm.go index 2ce55fea..b654d20a 100644 --- a/internal/rosa/llvm.go +++ b/internal/rosa/llvm.go @@ -73,14 +73,8 @@ func llvmFlagName(flag int) string { } } -const ( - llvmVersionMajor = "22" - llvmVersion = llvmVersionMajor + ".1.1" -) - // newLLVMVariant returns a [pkg.Artifact] containing a LLVM variant. func (t Toolchain) newLLVMVariant(variant string, attr *llvmAttr) pkg.Artifact { - const checksum = "bQvV6D8AZvQykg7-uQb_saTbVavnSo1ykNJ3g57F5iE-evU3HuOYtcRnVIXTK76e" if attr == nil { panic("LLVM attr must be non-nil") @@ -169,7 +163,7 @@ ln -s ld.lld /work/system/bin/ld return t.NewPackage("llvm", llvmVersion, pkg.NewHTTPGetTar( nil, "https://github.com/llvm/llvm-project/archive/refs/tags/"+ "llvmorg-"+llvmVersion+".tar.gz", - mustDecode(checksum), + mustDecode(llvmChecksum), pkg.TarGzip, ), &PackageAttr{ Patches: attr.patches, diff --git a/internal/rosa/llvm_arm64.go b/internal/rosa/llvm_arm64.go index febdbbdd..79876699 100644 --- a/internal/rosa/llvm_arm64.go +++ b/internal/rosa/llvm_arm64.go @@ -2,3 +2,11 @@ package rosa // clangPatches are patches applied to the LLVM source tree for building clang. var clangPatches [][2]string + +// one version behind, latest fails 5 tests with 2 flaky on arm64 +const ( + llvmVersionMajor = "21" + llvmVersion = llvmVersionMajor + ".1.8" + + llvmChecksum = "8SUpqDkcgwOPsqHVtmf9kXfFeVmjVxl4LMn-qSE1AI_Xoeju-9HaoPNGtidyxyka" +) diff --git a/internal/rosa/llvm_latest.go b/internal/rosa/llvm_latest.go new file mode 100644 index 00000000..1a8737f8 --- /dev/null +++ b/internal/rosa/llvm_latest.go @@ -0,0 +1,11 @@ +//go:build !arm64 + +package rosa + +// latest version of LLVM, conditional to temporarily avoid broken new releases +const ( + llvmVersionMajor = "22" + llvmVersion = llvmVersionMajor + ".1.1" + + llvmChecksum = "bQvV6D8AZvQykg7-uQb_saTbVavnSo1ykNJ3g57F5iE-evU3HuOYtcRnVIXTK76e" +) |