From fa25fa1b0cba5c942c999d061245dc4c06b57b06 Mon Sep 17 00:00:00 2001 From: Ayke van Laethem Date: Thu, 31 Oct 2019 15:24:49 +0100 Subject: [PATCH] macos: use llvm@8 instead of just llvm in paths This should hopefully avoid needing to use `brew switch`. --- cgo/libclang_config.go | 4 ++-- commands.go | 6 +++--- go.mod | 2 +- go.sum | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cgo/libclang_config.go b/cgo/libclang_config.go index 96b4f4bc..4b08d3cb 100644 --- a/cgo/libclang_config.go +++ b/cgo/libclang_config.go @@ -4,8 +4,8 @@ package cgo /* #cgo linux CFLAGS: -I/usr/lib/llvm-8/include -#cgo darwin CFLAGS: -I/usr/local/opt/llvm/include +#cgo darwin CFLAGS: -I/usr/local/opt/llvm@8/include #cgo linux LDFLAGS: -L/usr/lib/llvm-8/lib -lclang -#cgo darwin LDFLAGS: -L/usr/local/opt/llvm/lib -lclang -lffi +#cgo darwin LDFLAGS: -L/usr/local/opt/llvm@8/lib -lclang -lffi */ import "C" diff --git a/commands.go b/commands.go index a0fb7aec..d7c6d57f 100644 --- a/commands.go +++ b/commands.go @@ -20,9 +20,9 @@ func init() { // Add the path to a Homebrew-installed LLVM 8 for ease of use (no need to // manually set $PATH). if runtime.GOOS == "darwin" { - commands["clang"] = append(commands["clang"], "/usr/local/opt/llvm/bin/clang-8") - commands["ld.lld"] = append(commands["ld.lld"], "/usr/local/opt/llvm/bin/ld.lld") - commands["wasm-ld"] = append(commands["wasm-ld"], "/usr/local/opt/llvm/bin/wasm-ld") + commands["clang"] = append(commands["clang"], "/usr/local/opt/llvm@8/bin/clang-8") + commands["ld.lld"] = append(commands["ld.lld"], "/usr/local/opt/llvm@8/bin/ld.lld") + commands["wasm-ld"] = append(commands["wasm-ld"], "/usr/local/opt/llvm@8/bin/wasm-ld") } // Add the path for when LLVM was installed with the installer from // llvm.org, which by default doesn't add LLVM to the $PATH environment diff --git a/go.mod b/go.mod index 64668f6c..70e1e86b 100644 --- a/go.mod +++ b/go.mod @@ -9,5 +9,5 @@ require ( go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45 golang.org/x/sys v0.0.0-20191010194322-b09406accb47 // indirect golang.org/x/tools v0.0.0-20190227180812-8dcc6e70cdef - tinygo.org/x/go-llvm v0.0.0-20190818154551-95bc4ffe1add + tinygo.org/x/go-llvm v0.0.0-20191103182207-90b6e4bdc0b9 ) diff --git a/go.sum b/go.sum index 341c3e5b..098edb00 100644 --- a/go.sum +++ b/go.sum @@ -20,3 +20,5 @@ tinygo.org/x/go-llvm v0.0.0-20190224120431-7707ae5d1261 h1:rJS2Hga39YAnm7DE4qrPm tinygo.org/x/go-llvm v0.0.0-20190224120431-7707ae5d1261/go.mod h1:fv1F0BSNpxMfCL0zF3M4OPFbgYHnhtB6ST0HvUtu/LE= tinygo.org/x/go-llvm v0.0.0-20190818154551-95bc4ffe1add h1:dFjMH1sLhYADg8UQm7DB56B7e+TfvAmWmEZLhyv3r/w= tinygo.org/x/go-llvm v0.0.0-20190818154551-95bc4ffe1add/go.mod h1:fv1F0BSNpxMfCL0zF3M4OPFbgYHnhtB6ST0HvUtu/LE= +tinygo.org/x/go-llvm v0.0.0-20191103182207-90b6e4bdc0b9 h1:d6rAX39a3C0pKrY5HcojEGyN8w9ocU0v7X28lC/TRKU= +tinygo.org/x/go-llvm v0.0.0-20191103182207-90b6e4bdc0b9/go.mod h1:fv1F0BSNpxMfCL0zF3M4OPFbgYHnhtB6ST0HvUtu/LE=