cgo: add package directory to header include paths

loader/cgo.go

@@ -73,7 +73,7 @@ typedef unsigned long long  _Cgo_ulonglong;
 
 // processCgo extracts the `import "C"` statement from the AST, parses the
 // comment with libclang, and modifies the AST to use this information.
-func (p *Package) processCgo(filename string, f *ast.File) error {
+func (p *Package) processCgo(filename string, f *ast.File, cflags []string) error {
 	info := &fileInfo{
 		File:     f,
 		filename: filename,
@@ -106,7 +106,7 @@ func (p *Package) processCgo(filename string, f *ast.File) error {
 		// source location.
 		info.importCPos = spec.Path.ValuePos
 
-		err = info.parseFragment(cgoComment + cgoTypes)
+		err = info.parseFragment(cgoComment+cgoTypes, cflags)
 		if err != nil {
 			return err
 		}

loader/libclang.go

@@ -20,7 +20,7 @@ import "C"
 
 var globalFileInfo *fileInfo
 
-func (info *fileInfo) parseFragment(fragment string) error {
+func (info *fileInfo) parseFragment(fragment string, cflags []string) error {
 	index := C.clang_createIndex(0, 1)
 	defer C.clang_disposeIndex(index)
 
@@ -36,11 +36,21 @@ func (info *fileInfo) parseFragment(fragment string) error {
 		Contents: fragmentC,
 	}
 
+	// convert Go slice of strings to C array of strings.
+	cmdargsC := C.malloc(C.size_t(len(cflags)) * C.size_t(unsafe.Sizeof(uintptr(0))))
+	defer C.free(cmdargsC)
+	cmdargs := (*[1<<30 - 1]*C.char)(cmdargsC)
+	for i, cflag := range cflags {
+		s := C.CString(cflag)
+		cmdargs[i] = s
+		defer C.free(unsafe.Pointer(s))
+	}
+
 	var unit C.CXTranslationUnit
 	errCode := C.clang_parseTranslationUnit2(
 		index,
 		filenameC,
-		(**C.char)(unsafe.Pointer(uintptr(0))), 0, // command line args
+		(**C.char)(cmdargsC), C.int(len(cflags)), // command line args
 		&unsavedFile, 1, // unsaved files
 		C.CXTranslationUnit_None,
 		&unit)

loader/loader.go

@@ -20,6 +20,7 @@ type Program struct {
 	fset        *token.FileSet
 	TypeChecker types.Config
 	Dir         string // current working directory (for error reporting)
+	CFlags      []string
 }
 
 // Package holds a loaded package, its imports, and its parsed files.
@@ -290,7 +291,7 @@ func (p *Package) parseFiles() ([]*ast.File, error) {
 			fileErrs = append(fileErrs, err)
 			continue
 		}
-		err = p.processCgo(path, f)
+		err = p.processCgo(path, f, append(p.CFlags, "-I"+p.Package.Dir))
 		if err != nil {
 			fileErrs = append(fileErrs, err)
 			continue