JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix ordering of protoc includes (#2308)

Browse Source
This commit is contained in:
Andrew Harding 2019-07-06 10:52:15 -06:00 committed by Stefan Benten
parent 7aca0eb284
commit e3a9c2db90
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/protobuf.go
View File

@ -146,9 +146,12 @@ func generate(dir string, dirs []string, files []string) error {
}
func appendCommonArguments(args []string, dir string, dirs []string, files []string) []string {
var includes []string
prependDirInclude := false
for _, otherdir := range dirs {
if otherdir == dir {
args = append(args, "-I=.")
// the include for the directory must be added first... see below.
prependDirInclude = true
continue
}
@ -157,9 +160,16 @@ func appendCommonArguments(args []string, dir string, dirs []string, files []str
panic(err)
}
args = append(args, "-I="+reldir)
includes = append(includes, "-I="+reldir)
}
if prependDirInclude {
// The include for the directory needs to be added first, otherwise the
// .proto files it contains will be shadowed by .proto files in the
// other directories with matching names (causing protoc to bail).
args = append(args, "-I=.")
}
args = append(args, includes...)
args = append(args, files...)
return args