builder: also check lib64 for clang include path.

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
+10 -4
View File
@@ -40,13 +40,19 @@ func getClangHeaderPath(TINYGOROOT string) string {
// Example executable:
// /usr/lib/llvm-9/bin/clang
// 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))
clangVersionRoot := filepath.Join(llvmRoot, "lib", "clang")
clangVersionRoot := filepath.Join(llvmRoot, "lib64", "clang")
dirs, err := ioutil.ReadDir(clangVersionRoot)
if err != nil {
// Unexpected.
continue
// Example include path:
// /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))
for i, d := range dirs {