tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-12 06:53:40 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

all: switch to LLVM 9

Browse Source
This commit is contained in:
Ayke van Laethem
2019-11-01 21:53:21 +01:00
committed by Ayke
parent 172efc26a7
commit 118af9df69
11 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder/commands.go
+7 -7
View File
@@ -13,18 +13,18 @@ import (
// distributions or may not even exist in $PATH, in which case absolute paths
// may be used.
var commands = map[string][]string{
"clang": {"clang-8"},
"ld.lld": {"ld.lld-8", "ld.lld"},
"wasm-ld": {"wasm-ld-8", "wasm-ld"},
"clang": {"clang-9"},
"ld.lld": {"ld.lld-9", "ld.lld"},
"wasm-ld": {"wasm-ld-9", "wasm-ld"},
}
func init() {
// Add the path to a Homebrew-installed LLVM 8 for ease of use (no need to
// Add the path to a Homebrew-installed LLVM 9 for ease of use (no need to
// manually set $PATH).
if runtime.GOOS == "darwin" {
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")
commands["clang"] = append(commands["clang"], "/usr/local/opt/llvm@9/bin/clang-9")
commands["ld.lld"] = append(commands["ld.lld"], "/usr/local/opt/llvm@9/bin/ld.lld")
commands["wasm-ld"] = append(commands["wasm-ld"], "/usr/local/opt/llvm@9/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
builder/env.go
+2 -2
View File
@@ -96,9 +96,9 @@ func getClangHeaderPath(TINYGOROOT string) string {
return ""
}
// Example executable:
// /usr/lib/llvm-8/bin/clang
// /usr/lib/llvm-9/bin/clang
// Example include path:
// /usr/lib/llvm-8/lib/clang/8.0.1/include/
// /usr/lib/llvm-9/lib/clang/9.0.1/include/
llvmRoot := filepath.Dir(filepath.Dir(binpath))
clangVersionRoot := filepath.Join(llvmRoot, "lib", "clang")
dirs, err := ioutil.ReadDir(clangVersionRoot)