Fix mixed code precompiled libraries

facchinm · cmaglie · commit 8f06f7fe1117 · 2020-04-28T13:27:16.000+02:00
This patch restores some functionalities broken by arduino#512 . It introduces a BREAKING CHANGE to "precompiled" field If merged, "precompiled" means that the library ONLY contains a precompiled library and its headers. No file containing implementation will be compiled if the library is specified as such. Fixes arduino/arduino-builder#353 Tested with * arduino#512 (comment) (Nano33BLE and generic MKR board) * https://github.com/BoschSensortec/BSEC-Arduino-library (works after removing precompiled=true directive in library.properties) * https://github.com/vidor-libraries/USBBlaster (MKRVidor, fully precompiled)
diff --git a/legacy/builder/phases/libraries_builder.go b/legacy/builder/phases/libraries_builder.go
@@ -55,7 +55,7 @@ func (s *LibrariesBuilder) Run(ctx *types.Context) error {
 	ctx.LibrariesObjectFiles = objectFiles
 
 	// Search for precompiled libraries
-	fixLDFLAGforPrecompiledLibraries(ctx, libs)
+	fixLDFLAG(ctx, libs)
 
 	return nil
 }
@@ -109,35 +109,33 @@ func findExpectedPrecompiledLibFolder(ctx *types.Context, library *libraries.Lib
 	return nil
 }
 
-func fixLDFLAGforPrecompiledLibraries(ctx *types.Context, libs libraries.List) error {
+func fixLDFLAG(ctx *types.Context, libs libraries.List) error {
 
 	for _, library := range libs {
-		if library.Precompiled {
-			// add library src path to compiler.c.elf.extra_flags
-			// use library.Name as lib name and srcPath/{mcpu} as location
-			path := findExpectedPrecompiledLibFolder(ctx, library)
-			if path == nil {
-				break
-			}
-			// find all library names in the folder and prepend -l
-			filePaths := []string{}
-			libs_cmd := library.LDflags + " "
-			extensions := func(ext string) bool {
-				return PRECOMPILED_LIBRARIES_VALID_EXTENSIONS_DYNAMIC[ext] || PRECOMPILED_LIBRARIES_VALID_EXTENSIONS_STATIC[ext]
-			}
-			utils.FindFilesInFolder(&filePaths, path.String(), extensions, false)
-			for _, lib := range filePaths {
-				name := strings.TrimSuffix(filepath.Base(lib), filepath.Ext(lib))
-				// strip "lib" first occurrence
-				if strings.HasPrefix(name, "lib") {
-					name = strings.Replace(name, "lib", "", 1)
-					libs_cmd += "-l" + name + " "
-				}
+		// add library src path to compiler.c.elf.extra_flags
+		// use library.Name as lib name and srcPath/{mcpu} as location
+		path := findExpectedPrecompiledLibFolder(ctx, library)
+		if path == nil {
+			break
+		}
+		// find all library names in the folder and prepend -l
+		filePaths := []string{}
+		libs_cmd := library.LDflags + " "
+		extensions := func(ext string) bool {
+			return PRECOMPILED_LIBRARIES_VALID_EXTENSIONS_DYNAMIC[ext] || PRECOMPILED_LIBRARIES_VALID_EXTENSIONS_STATIC[ext]
+		}
+		utils.FindFilesInFolder(&filePaths, path.String(), extensions, false)
+		for _, lib := range filePaths {
+			name := strings.TrimSuffix(filepath.Base(lib), filepath.Ext(lib))
+			// strip "lib" first occurrence
+			if strings.HasPrefix(name, "lib") {
+				name = strings.Replace(name, "lib", "", 1)
+				libs_cmd += "-l" + name + " "
 			}
-
-			currLDFlags := ctx.BuildProperties.Get(constants.BUILD_PROPERTIES_COMPILER_LIBRARIES_LDFLAGS)
-			ctx.BuildProperties.Set(constants.BUILD_PROPERTIES_COMPILER_LIBRARIES_LDFLAGS, currLDFlags+"\"-L"+path.String()+"\" "+libs_cmd+" ")
 		}
+
+		currLDFlags := ctx.BuildProperties.Get(constants.BUILD_PROPERTIES_COMPILER_LIBRARIES_LDFLAGS)
+		ctx.BuildProperties.Set(constants.BUILD_PROPERTIES_COMPILER_LIBRARIES_LDFLAGS, currLDFlags+"\"-L"+path.String()+"\" "+libs_cmd+" ")
 	}
 	return nil
 }
