Recompiled libraries: only select a folder if it contains files

Author: facchinm

legacy/builder/phases/libraries_builder.go

@@ -53,6 +53,18 @@ func (s *LibrariesBuilder) Run(ctx *types.Context) error {
 	return nil
 }
 
+func containsFile(folder *paths.Path) bool {
+	res, _ := folder.ReadDir()
+	hasfiles := false
+	for _, el := range res {
+		if !el.IsDir() {
+			hasfiles = true
+			break
+		}
+	}
+	return hasfiles
+}
+
 func findExpectedPrecompiledLibFolder(ctx *types.Context, library *libraries.Library) *paths.Path {
 	mcu := ctx.BuildProperties.Get(constants.BUILD_PROPERTIES_BUILD_MCU)
 	// Add fpu specifications if they exist
@@ -86,15 +98,15 @@ func findExpectedPrecompiledLibFolder(ctx *types.Context, library *libraries.Lib
 	if len(fpuSpecs) > 0 {
 		fpuSpecs = strings.TrimRight(fpuSpecs, "-")
 		fullPrecompDir := library.SourceDir.Join(mcu).Join(fpuSpecs)
-		if fullPrecompDir.Exist() {
+		if fullPrecompDir.Exist() && containsFile(fullPrecompDir) {
 			logger.Fprintln(os.Stdout, constants.LOG_LEVEL_INFO, "Using precompiled library in {0}", fullPrecompDir)
 			return fullPrecompDir
 		}
 		logger.Fprintln(os.Stdout, constants.LOG_LEVEL_INFO, "Precompiled library in \"{0}\" not found", fullPrecompDir)
 	}
 
 	precompDir := library.SourceDir.Join(mcu)
-	if precompDir.Exist() {
+	if precompDir.Exist() && containsFile(precompDir) {
 		logger.Fprintln(os.Stdout, constants.LOG_LEVEL_INFO, "Using precompiled library in {0}", precompDir)
 		return precompDir
 	}