Commitbb73b9c

authored and

committed

Do not cache lib-scan for 'unmanaged' paths

Those are the paths given by --library / --libraries flags.

1 parent0056058 commitbb73b9cCopy full SHA for bb73b9c

File tree

+14

-13

lines changed

+14

-13

lines changed

Lines changed: 14 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -245,23 +245,24 @@ func (lm LibrariesManager) loadLibrariesFromDir(librariesDir LibrariesDir) []*`
`245`	`245`	`loadedLibs=append(loadedLibs,library)`
`246`	`246`	`}`
`247`	`247`
`248`		`-// Write lib cache`
`249`		`-cache,err:=cacheFilePath.Create()`
`250`		`-iferr!=nil {`
`251`		`-s:=status.Newf(codes.FailedPrecondition,"creating lib cache %[1]s: %[2]s",cacheFilePath,err)`
`252`		`-returnappend(statuses,s)`
`253`		`-}`
`254`	`248`	`// Preload source files and header`
`255`	`249`	`for_,lib:=rangeloadedLibs {`
`256`	`250`	`lib.SourceHeaders()`
`257`	`251`	`}`
`258`		`-// Write the cache`
`259`		`-err=loadedLibs.MarshalBinary(cache,librariesDir.Path)`
`260`		`-cache.Close()`
`261`		`-iferr!=nil {`
`262`		`-cacheFilePath.Remove()`
`263`		`-s:=status.Newf(codes.FailedPrecondition,"writing lib cache %[1]s: %[2]s",cacheFilePath,err)`
`264`		`-returnappend(statuses,s)`
	`252`	`+iflibrariesDir.Location!=libraries.Unmanaged {`
	`253`	`+// Write lib cache`
	`254`	`+cache,err:=cacheFilePath.Create()`
	`255`	`+iferr!=nil {`
	`256`	`+s:=status.Newf(codes.FailedPrecondition,"creating lib cache %[1]s: %[2]s",cacheFilePath,err)`
	`257`	`+returnappend(statuses,s)`
	`258`	`+}`
	`259`	`+err=loadedLibs.MarshalBinary(cache,librariesDir.Path)`
	`260`	`+cache.Close()`
	`261`	`+iferr!=nil {`
	`262`	`+cacheFilePath.Remove()`
	`263`	`+s:=status.Newf(codes.FailedPrecondition,"writing lib cache %[1]s: %[2]s",cacheFilePath,err)`
	`264`	`+returnappend(statuses,s)`
	`265`	`+}`
`265`	`266`	`}`
`266`	`267`	`}`
`267`	`268`

Comments

(0)