From cb01d4d63e09b894969a22a4621c693f55353fd0 Mon Sep 17 00:00:00 2001 From: Nia Waldvogel Date: Sat, 8 Jan 2022 09:19:32 -0500 Subject: [PATCH] builder (env): update clang header search path to look in /usr/lib Arch Linux stores the clang executable seperately from its data, so the search based on the executable does not work. This change searches /usr/lib as a backup. --- builder/env.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/builder/env.go b/builder/env.go index 5fec0d82..b28173c4 100644 --- a/builder/env.go +++ b/builder/env.go @@ -84,6 +84,20 @@ func getClangHeaderPath(TINYGOROOT string) string { } } + // On Arch Linux, the clang executable is stored in /usr/bin rather than being symlinked from there. + // Search directly in /usr/lib for clang. + if matches, err := filepath.Glob("/usr/lib/clang/" + llvmMajor + ".*.*"); err == nil { + // Check for the highest version first. + sort.Strings(matches) + for i := len(matches) - 1; i >= 0; i-- { + path := filepath.Join(matches[i], "include") + _, err := os.Stat(filepath.Join(path, "stdint.h")) + if err == nil { + return path + } + } + } + // Could not find it. return "" }