@@ -49,7 +49,6 @@ type libraryResolutionResult struct {
49
49
50
50
// SketchLibrariesDetector todo
51
51
type SketchLibrariesDetector struct {
52
- librariesManager * librariesmanager.LibrariesManager
53
52
librariesResolver * librariesresolver.Cpp
54
53
useCachedLibrariesResolution bool
55
54
onlyUpdateCompilationDatabase bool
@@ -62,15 +61,13 @@ type SketchLibrariesDetector struct {
62
61
63
62
// NewSketchLibrariesDetector todo
64
63
func NewSketchLibrariesDetector (
65
- lm * librariesmanager.LibrariesManager ,
66
64
libsResolver * librariesresolver.Cpp ,
67
65
useCachedLibrariesResolution bool ,
68
66
onlyUpdateCompilationDatabase bool ,
69
67
logger * logger.BuilderLogger ,
70
68
diagnosticStore * diagnostics.Store ,
71
69
) * SketchLibrariesDetector {
72
70
return & SketchLibrariesDetector {
73
- librariesManager : lm ,
74
71
librariesResolver : libsResolver ,
75
72
useCachedLibrariesResolution : useCachedLibrariesResolution ,
76
73
librariesResolutionResults : map [string ]libraryResolutionResult {},
@@ -599,7 +596,7 @@ func LibrariesLoader(
599
596
librariesManager * librariesmanager.LibrariesManager ,
600
597
builtInLibrariesDirs * paths.Path , libraryDirs , otherLibrariesDirs paths.PathList ,
601
598
actualPlatform , targetPlatform * cores.PlatformRelease ,
602
- ) (* librariesmanager. LibrariesManager , * librariesresolver.Cpp , []byte , error ) {
599
+ ) (* librariesresolver.Cpp , []byte , error ) {
603
600
verboseOut := & bytes.Buffer {}
604
601
lm := librariesManager
605
602
if useCachedLibrariesResolution {
@@ -613,7 +610,7 @@ func LibrariesLoader(
613
610
builtInLibrariesFolders := builtInLibrariesDirs
614
611
if builtInLibrariesFolders != nil {
615
612
if err := builtInLibrariesFolders .ToAbs (); err != nil {
616
- return nil , nil , nil , err
613
+ return nil , nil , err
617
614
}
618
615
lmb .AddLibrariesDir (librariesmanager.LibrariesDir {
619
616
Path : builtInLibrariesFolders ,
@@ -636,7 +633,7 @@ func LibrariesLoader(
636
633
637
634
librariesFolders := otherLibrariesDirs
638
635
if err := librariesFolders .ToAbs (); err != nil {
639
- return nil , nil , nil , err
636
+ return nil , nil , err
640
637
}
641
638
for _ , folder := range librariesFolders {
642
639
lmb .AddLibrariesDir (librariesmanager.LibrariesDir {
@@ -668,7 +665,7 @@ func LibrariesLoader(
668
665
669
666
allLibs := lm .FindAllInstalled ()
670
667
resolver := librariesresolver .NewCppResolver (allLibs , targetPlatform , actualPlatform )
671
- return lm , resolver , verboseOut .Bytes (), nil
668
+ return resolver , verboseOut .Bytes (), nil
672
669
}
673
670
674
671
type includeCacheEntry struct {
0 commit comments