From 2eced006eca32ab43ff99470591cacc7f74d7b58 Mon Sep 17 00:00:00 2001 From: Ayke van Laethem Date: Wed, 22 Apr 2026 11:14:49 +0200 Subject: [PATCH] Use LLVM 20 by default for now We still haven't updated TinyGo, so this change is needed so we can use https://github.com/tinygo-org/go-llvm/pull/73 in TinyGo. --- .github/workflows/test.yml | 6 +++--- llvm_config_llvm20.go | 2 +- llvm_config_llvm21.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6d004c5..9432e6a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,7 +27,7 @@ jobs: run: go test -v -tags=llvm${{ matrix.llvm }} - name: Test default LLVM - if: matrix.llvm == 21 + if: matrix.llvm == 20 run: go test -v test-linux: @@ -52,7 +52,7 @@ jobs: run: go test -v -tags=llvm${{ matrix.llvm }} - name: Test default LLVM - if: matrix.llvm == 21 + if: matrix.llvm == 20 run: go test -v test-linux-fedora: @@ -75,6 +75,6 @@ jobs: run: go test -v -tags=llvm${{ matrix.llvm }} - name: Test default LLVM - if: matrix.llvm == 21 + if: matrix.llvm == 20 run: go test -v diff --git a/llvm_config_llvm20.go b/llvm_config_llvm20.go index 9c0a350..6741b28 100644 --- a/llvm_config_llvm20.go +++ b/llvm_config_llvm20.go @@ -1,4 +1,4 @@ -//go:build !byollvm && llvm20 +//go:build !byollvm && !llvm14 && !llvm15 && !llvm16 && !llvm17 && !llvm18 && !llvm19 && !llvm21 package llvm diff --git a/llvm_config_llvm21.go b/llvm_config_llvm21.go index e74a1f8..263c2fc 100644 --- a/llvm_config_llvm21.go +++ b/llvm_config_llvm21.go @@ -1,4 +1,4 @@ -//go:build !byollvm && !llvm14 && !llvm15 && !llvm16 && !llvm17 && !llvm18 && !llvm19 && !llvm20 +//go:build !byollvm && llvm21 package llvm