Commit 6058360

committed

Add additional paths also in library discovery phase

This tries to avoid bundled libraries shadowing other includes

1 parent 2ffbe85 commit 6058360Copy full SHA for 6058360

File tree

-0

lines changed

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,11 @@ func findIncludesUntilDone(ctx types.Context, cache includeCache, sourceFile t`
`318`	`318`	`if library, ok := sourceFile.Origin.(*libraries.Library); ok && library.UtilityDir != nil {`
`319`	`319`	`includes = append(includes, library.UtilityDir)`
`320`	`320`	`}`
	`321`	`+ if library, ok := sourceFile.Origin.(*libraries.Library); ok && library.AdditionalIncludePaths != nil {`
	`322`	`+ for _, el := range library.AdditionalIncludePaths {`
	`323`	`+ includes = append(includes, el)`
	`324`	`+ }`
	`325`	`+ }`
`321`	`326`	`var preproc_err error`
`322`	`327`	`var preproc_stderr []byte`
`323`	`328`	`if unchanged && cache.valid {`

Comments

(0)