diff --git a/.circleci/config.yml b/.circleci/config.yml index 3114194f..c7bb3791 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -112,12 +112,12 @@ commands: - /go/pkg/mod jobs: - test-llvm13-go116: + test-llvm14-go116: docker: - image: golang:1.16-buster steps: - test-linux: - llvm: "13" + llvm: "14" test-llvm14-go119: docker: - image: golang:1.19beta1-buster @@ -131,7 +131,7 @@ workflows: jobs: # This tests our lowest supported versions of Go and LLVM, to make sure at # least the smoke tests still pass. - - test-llvm13-go116 + - test-llvm14-go116 # This tests a beta version of Go. It should be removed once regular # release builds are built using this version. - test-llvm14-go119 diff --git a/cgo/libclang_config_llvm13.go b/cgo/libclang_config_llvm13.go deleted file mode 100644 index eba84f49..00000000 --- a/cgo/libclang_config_llvm13.go +++ /dev/null @@ -1,16 +0,0 @@ -//go:build !byollvm && llvm13 -// +build !byollvm,llvm13 - -package cgo - -/* -#cgo linux CFLAGS: -I/usr/lib/llvm-13/include -#cgo darwin,amd64 CFLAGS: -I/usr/local/opt/llvm@13/include -#cgo darwin,arm64 CFLAGS: -I/opt/homebrew/opt/llvm@13/include -#cgo freebsd CFLAGS: -I/usr/local/llvm13/include -#cgo linux LDFLAGS: -L/usr/lib/llvm-13/lib -lclang -#cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/llvm@13/lib -lclang -lffi -#cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/llvm@13/lib -lclang -lffi -#cgo freebsd LDFLAGS: -L/usr/local/llvm13/lib -lclang -*/ -import "C" diff --git a/cgo/libclang_config_llvm14.go b/cgo/libclang_config_llvm14.go index 00081b2f..0553bd50 100644 --- a/cgo/libclang_config_llvm14.go +++ b/cgo/libclang_config_llvm14.go @@ -1,5 +1,5 @@ -//go:build !byollvm && !llvm13 -// +build !byollvm,!llvm13 +//go:build !byollvm +// +build !byollvm package cgo diff --git a/go.mod b/go.mod index 8afa98bc..758185d2 100644 --- a/go.mod +++ b/go.mod @@ -15,5 +15,5 @@ require ( golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 golang.org/x/tools v0.1.11 gopkg.in/yaml.v2 v2.4.0 - tinygo.org/x/go-llvm v0.0.0-20220626113704-45f1e2dbf887 + tinygo.org/x/go-llvm v0.0.0-20220802112859-5bb0b77907a7 ) diff --git a/go.sum b/go.sum index 7d11e5a3..7aad8257 100644 --- a/go.sum +++ b/go.sum @@ -79,5 +79,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -tinygo.org/x/go-llvm v0.0.0-20220626113704-45f1e2dbf887 h1:k+Y1DU/WoBDkTkRJGF149yk3S2K2VhNglN435DXDS5s= -tinygo.org/x/go-llvm v0.0.0-20220626113704-45f1e2dbf887/go.mod h1:GFbusT2VTA4I+l4j80b17KFK+6whv69Wtny5U+T8RR0= +tinygo.org/x/go-llvm v0.0.0-20220802112859-5bb0b77907a7 h1:nSLR52mUw7DPQQVA3ZJFH63zjU4ME84fKiin6mdnYWc= +tinygo.org/x/go-llvm v0.0.0-20220802112859-5bb0b77907a7/go.mod h1:GFbusT2VTA4I+l4j80b17KFK+6whv69Wtny5U+T8RR0=