builder: update Clang header location

We have long since moved towards a different location for these headers
in the git checkout, so update where getClangHeaderPath looks for these
headers.

Also add an extra check to make sure a path has been detected.

builder/compiler-builtin.go

@@ -26,7 +26,11 @@ func runCCompiler(command string, flags ...string) error {
 	switch command {
 	case "clang":
 		// Compile this with the internal Clang compiler.
-		flags = append(flags, "-I"+getClangHeaderPath(goenv.Get("TINYGOROOT")))
+		headerPath := getClangHeaderPath(goenv.Get("TINYGOROOT"))
+		if headerPath == "" {
+			return errors.New("could not locate Clang headers")
+		}
+		flags = append(flags, "-I"+headerPath)
 		flags = append([]string{"tinygo:" + command}, flags...)
 		var cflag *C.char
 		buf := C.calloc(C.size_t(len(flags)), C.size_t(unsafe.Sizeof(cflag)))

builder/env.go

@@ -71,7 +71,7 @@ func GorootVersionString(goroot string) (string, error) {
 // various ways.
 func getClangHeaderPath(TINYGOROOT string) string {
 	// Check whether we're running from the source directory.
-	path := filepath.Join(TINYGOROOT, "llvm", "tools", "clang", "lib", "Headers")
+	path := filepath.Join(TINYGOROOT, "llvm-project", "clang", "lib", "Headers")
 	if _, err := os.Stat(path); !os.IsNotExist(err) {
 		return path
 	}