From 28e57e22a3ed4c46a03b17f3c2a71e806600c9b2 Mon Sep 17 00:00:00 2001 From: Ayke van Laethem Date: Sun, 15 Oct 2023 02:07:24 +0200 Subject: [PATCH] all: fix a small incompatibility with Nix Hopefully this won't break anybody: while all tests still pass, there could in theory be systems where not supplying those libraries leads to linker errors. --- cgo/libclang_config_llvm15.go | 4 ++-- cgo/libclang_config_llvm16.go | 4 ++-- cgo/libclang_config_llvm17.go | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cgo/libclang_config_llvm15.go b/cgo/libclang_config_llvm15.go index e105dfe728..edb1128dc2 100644 --- a/cgo/libclang_config_llvm15.go +++ b/cgo/libclang_config_llvm15.go @@ -8,8 +8,8 @@ package cgo #cgo darwin,arm64 CFLAGS: -I/opt/homebrew/opt/llvm@15/include #cgo freebsd CFLAGS: -I/usr/local/llvm15/include #cgo linux LDFLAGS: -L/usr/lib/llvm-15/lib -lclang -#cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/llvm@15/lib -lclang -lffi -#cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/llvm@15/lib -lclang -lffi +#cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/llvm@15/lib -lclang +#cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/llvm@15/lib -lclang #cgo freebsd LDFLAGS: -L/usr/local/llvm15/lib -lclang */ import "C" diff --git a/cgo/libclang_config_llvm16.go b/cgo/libclang_config_llvm16.go index 8afdb14cb8..5bc5377ca1 100644 --- a/cgo/libclang_config_llvm16.go +++ b/cgo/libclang_config_llvm16.go @@ -14,8 +14,8 @@ package cgo #cgo darwin,arm64 CFLAGS: -I/opt/homebrew/opt/llvm@16/include #cgo freebsd CFLAGS: -I/usr/local/llvm16/include #cgo linux LDFLAGS: -L/usr/lib/llvm-16/lib -lclang -#cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/llvm@16/lib -lclang -lffi -#cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/llvm@16/lib -lclang -lffi +#cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/llvm@16/lib -lclang +#cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/llvm@16/lib -lclang #cgo freebsd LDFLAGS: -L/usr/local/llvm16/lib -lclang */ import "C" diff --git a/cgo/libclang_config_llvm17.go b/cgo/libclang_config_llvm17.go index fd6d1480e3..6395d8a3af 100644 --- a/cgo/libclang_config_llvm17.go +++ b/cgo/libclang_config_llvm17.go @@ -8,8 +8,8 @@ package cgo #cgo darwin,arm64 CFLAGS: -I/opt/homebrew/opt/llvm@17/include #cgo freebsd CFLAGS: -I/usr/local/llvm17/include #cgo linux LDFLAGS: -L/usr/lib/llvm-17/lib -lclang -#cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/llvm@17/lib -lclang -lffi -#cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/llvm@17/lib -lclang -lffi +#cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/llvm@17/lib -lclang +#cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/llvm@17/lib -lclang #cgo freebsd LDFLAGS: -L/usr/local/llvm17/lib -lclang */ import "C" diff --git a/go.mod b/go.mod index 36d601f882..6c12e81e4d 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( golang.org/x/sys v0.11.0 golang.org/x/tools v0.12.0 gopkg.in/yaml.v2 v2.4.0 - tinygo.org/x/go-llvm v0.0.0-20230923132128-bba3c7009bfd + tinygo.org/x/go-llvm v0.0.0-20231014233752-75a8a9fe6f74 ) require ( diff --git a/go.sum b/go.sum index 1b5ad074be..b15186b57d 100644 --- a/go.sum +++ b/go.sum @@ -65,5 +65,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= -tinygo.org/x/go-llvm v0.0.0-20230923132128-bba3c7009bfd h1:iSVvs8r3ooxYTsmcf7FKCHq83eOSUkWKtmQhnDadDQU= -tinygo.org/x/go-llvm v0.0.0-20230923132128-bba3c7009bfd/go.mod h1:GFbusT2VTA4I+l4j80b17KFK+6whv69Wtny5U+T8RR0= +tinygo.org/x/go-llvm v0.0.0-20231014233752-75a8a9fe6f74 h1:tW8XhLI9gUZLL+2pG0HYb5dc6bpMj1aqtESpizXPnMY= +tinygo.org/x/go-llvm v0.0.0-20231014233752-75a8a9fe6f74/go.mod h1:GFbusT2VTA4I+l4j80b17KFK+6whv69Wtny5U+T8RR0=