Skip to content

Commit c0eed43

Browse files
make WarnAboutArchIncompatibleLibraries a method recevier of arduino/builder
1 parent 352362d commit c0eed43

File tree

3 files changed

+24
-49
lines changed

3 files changed

+24
-49
lines changed

arduino/builder/libraries.go

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"github.com/arduino/arduino-cli/arduino/builder/cpp"
2323
"github.com/arduino/arduino-cli/arduino/builder/progress"
2424
"github.com/arduino/arduino-cli/arduino/builder/utils"
25+
"github.com/arduino/arduino-cli/arduino/cores"
2526
"github.com/arduino/arduino-cli/arduino/libraries"
2627
f "github.com/arduino/arduino-cli/internal/algorithms"
2728
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
@@ -320,3 +321,25 @@ func (b *Builder) RemoveUnusedCompiledLibraries(importedLibraries libraries.List
320321

321322
return nil
322323
}
324+
325+
// WarnAboutArchIncompatibleLibraries fixdoc
326+
func (b *Builder) WarnAboutArchIncompatibleLibraries(
327+
targetPlatform *cores.PlatformRelease,
328+
importedLibraries libraries.List,
329+
) {
330+
archs := []string{targetPlatform.Platform.Architecture}
331+
overrides, _ := b.buildProperties.GetOk("architecture.override_check")
332+
if overrides != "" {
333+
archs = append(archs, strings.Split(overrides, ",")...)
334+
}
335+
336+
for _, importedLibrary := range importedLibraries {
337+
if !importedLibrary.SupportsAnyArchitectureIn(archs...) {
338+
b.logger.Info(
339+
tr("WARNING: library %[1]s claims to run on %[2]s architecture(s) and may be incompatible with your current board which runs on %[3]s architecture(s).",
340+
importedLibrary.Name,
341+
strings.Join(importedLibrary.Architectures, ", "),
342+
strings.Join(archs, ", ")))
343+
}
344+
}
345+
}

legacy/builder/builder.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -399,12 +399,9 @@ func containerBuildOptions(ctx *types.Context) types.BareCommand {
399399

400400
func warnAboutArchIncompatibleLibraries(ctx *types.Context) types.BareCommand {
401401
return types.BareCommand(func(ctx *types.Context) error {
402-
overrides, _ := ctx.Builder.GetBuildProperties().GetOk("architecture.override_check")
403-
WarnAboutArchIncompatibleLibraries(
402+
ctx.Builder.WarnAboutArchIncompatibleLibraries(
404403
ctx.TargetPlatform,
405-
overrides,
406404
ctx.SketchLibrariesDetector.ImportedLibraries(),
407-
func(s string) { ctx.BuilderLogger.Info(s) },
408405
)
409406
return nil
410407
})

legacy/builder/warn_about_arch_incompatible_libraries.go

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)