From a90865506d75827ff295f2ae7f74671ca91aa78e Mon Sep 17 00:00:00 2001 From: Ayke van Laethem Date: Sat, 16 Jan 2021 19:04:23 +0100 Subject: [PATCH] main: use LLVM 11 by default when linking LLVM dynamically This doesn't affect the release builds but it is helpful for TinyGo developers. --- cgo/libclang_config.go | 14 +++++++------- cgo/libclang_config_llvm10.go | 14 ++++++++++++++ cgo/libclang_config_llvm11.go | 14 -------------- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 cgo/libclang_config_llvm10.go delete mode 100644 cgo/libclang_config_llvm11.go diff --git a/cgo/libclang_config.go b/cgo/libclang_config.go index 24b95014..4a5d0603 100644 --- a/cgo/libclang_config.go +++ b/cgo/libclang_config.go @@ -1,14 +1,14 @@ // +build !byollvm -// +build !llvm9,!llvm11 +// +build !llvm10,!llvm9 package cgo /* -#cgo linux CFLAGS: -I/usr/lib/llvm-10/include -#cgo darwin CFLAGS: -I/usr/local/opt/llvm@10/include -#cgo freebsd CFLAGS: -I/usr/local/llvm10/include -#cgo linux LDFLAGS: -L/usr/lib/llvm-10/lib -lclang -#cgo darwin LDFLAGS: -L/usr/local/opt/llvm@10/lib -lclang -lffi -#cgo freebsd LDFLAGS: -L/usr/local/llvm10/lib -lclang +#cgo linux CFLAGS: -I/usr/lib/llvm-11/include +#cgo darwin CFLAGS: -I/usr/local/opt/llvm@11/include +#cgo freebsd CFLAGS: -I/usr/local/llvm11/include +#cgo linux LDFLAGS: -L/usr/lib/llvm-11/lib -lclang +#cgo darwin LDFLAGS: -L/usr/local/opt/llvm@11/lib -lclang -lffi +#cgo freebsd LDFLAGS: -L/usr/local/llvm11/lib -lclang */ import "C" diff --git a/cgo/libclang_config_llvm10.go b/cgo/libclang_config_llvm10.go new file mode 100644 index 00000000..9b993949 --- /dev/null +++ b/cgo/libclang_config_llvm10.go @@ -0,0 +1,14 @@ +// +build !byollvm +// +build llvm10 + +package cgo + +/* +#cgo linux CFLAGS: -I/usr/lib/llvm-10/include +#cgo darwin CFLAGS: -I/usr/local/opt/llvm@10/include +#cgo freebsd CFLAGS: -I/usr/local/llvm10/include +#cgo linux LDFLAGS: -L/usr/lib/llvm-10/lib -lclang +#cgo darwin LDFLAGS: -L/usr/local/opt/llvm@10/lib -lclang -lffi +#cgo freebsd LDFLAGS: -L/usr/local/llvm10/lib -lclang +*/ +import "C" diff --git a/cgo/libclang_config_llvm11.go b/cgo/libclang_config_llvm11.go deleted file mode 100644 index 6fab82be..00000000 --- a/cgo/libclang_config_llvm11.go +++ /dev/null @@ -1,14 +0,0 @@ -// +build !byollvm -// +build llvm11 - -package cgo - -/* -#cgo linux CFLAGS: -I/usr/lib/llvm-11/include -#cgo darwin CFLAGS: -I/usr/local/opt/llvm@11/include -#cgo freebsd CFLAGS: -I/usr/local/llvm11/include -#cgo linux LDFLAGS: -L/usr/lib/llvm-11/lib -lclang -#cgo darwin LDFLAGS: -L/usr/local/opt/llvm@11/lib -lclang -lffi -#cgo freebsd LDFLAGS: -L/usr/local/llvm11/lib -lclang -*/ -import "C" diff --git a/go.mod b/go.mod index bab259ae..9166c7b4 100644 --- a/go.mod +++ b/go.mod @@ -10,5 +10,5 @@ require ( github.com/marcinbor85/gohex v0.0.0-20200531091804-343a4b548892 go.bug.st/serial v1.0.0 golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2 - tinygo.org/x/go-llvm v0.0.0-20201104183921-570e7a6841d9 + tinygo.org/x/go-llvm v0.0.0-20210116180121-1bbb341ef8d0 ) diff --git a/go.sum b/go.sum index da502045..77c49342 100644 --- a/go.sum +++ b/go.sum @@ -48,5 +48,5 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbO golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -tinygo.org/x/go-llvm v0.0.0-20201104183921-570e7a6841d9 h1:l2kTQOhqEoeDTK3ckUnwReOQwMPUmURMIdjJbeAuDT4= -tinygo.org/x/go-llvm v0.0.0-20201104183921-570e7a6841d9/go.mod h1:fv1F0BSNpxMfCL0zF3M4OPFbgYHnhtB6ST0HvUtu/LE= +tinygo.org/x/go-llvm v0.0.0-20210116180121-1bbb341ef8d0 h1:P1OL2h1faLkzeScEQaE6HeUHpM+SQtvtXQIereZMxQ4= +tinygo.org/x/go-llvm v0.0.0-20210116180121-1bbb341ef8d0/go.mod h1:fv1F0BSNpxMfCL0zF3M4OPFbgYHnhtB6ST0HvUtu/LE=