tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-18 11:33:59 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

builder: also check lib64 for clang include path.

Browse Source 
On 64-bit Fedora, `lib64` is where the clang headers are, not `lib`. For
multiarch systems, both will exist, but it's likely you want 64-bit, so
check that first.
This commit is contained in:
Elliott Sales de Andrade
2020-09-20 08:00:02 -04:00
committed by GitHub
parent 13fe668929
commit 41afb77080
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder/env.go
+10 -4
View File
@@ -40,13 +40,19 @@ func getClangHeaderPath(TINYGOROOT string) string {
// Example executable: // Example executable:
// /usr/lib/llvm-9/bin/clang // /usr/lib/llvm-9/bin/clang
// Example include path: // Example include path:
// /usr/lib/llvm-9/lib/clang/9.0.1/include/ // /usr/lib/llvm-9/lib64/clang/9.0.1/include/
llvmRoot := filepath.Dir(filepath.Dir(binpath)) llvmRoot := filepath.Dir(filepath.Dir(binpath))
clangVersionRoot := filepath.Join(llvmRoot, "lib", "clang") clangVersionRoot := filepath.Join(llvmRoot, "lib64", "clang")
dirs, err := ioutil.ReadDir(clangVersionRoot) dirs, err := ioutil.ReadDir(clangVersionRoot)
if err != nil { if err != nil {
// Unexpected. // Example include path:
continue // /usr/lib/llvm-9/lib/clang/9.0.1/include/
clangVersionRoot = filepath.Join(llvmRoot, "lib", "clang")
dirs, err = ioutil.ReadDir(clangVersionRoot)
if err != nil {
// Unexpected.
continue
}
} }
dirnames := make([]string, len(dirs)) dirnames := make([]string, len(dirs))
for i, d := range dirs { for i, d := range dirs {