Bugfix: do not overwrite board properies during compile

Fix arduino#1614
cmaglie · Aug 1, 2022 · fa93ff3 · fa93ff3
1 parent 5332ffd
commit fa93ff3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/legacy/builder/setup_build_properties.go b/legacy/builder/setup_build_properties.go
@@ -36,12 +36,11 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
 
 	targetPlatform := ctx.TargetPlatform
 	actualPlatform := ctx.ActualPlatform
-	targetBoard := ctx.TargetBoard
 
 	buildProperties := properties.NewMap()
 	buildProperties.Merge(actualPlatform.Properties)
 	buildProperties.Merge(targetPlatform.Properties)
-	buildProperties.Merge(targetBoard.Properties)
+	buildProperties.Merge(ctx.TargetBoardBuildProperties)
 
 	if ctx.BuildPath != nil {
 		buildProperties.SetPath("build.path", ctx.BuildPath)

diff --git a/legacy/builder/target_board_resolver.go b/legacy/builder/target_board_resolver.go
@@ -30,8 +30,6 @@ func (s *TargetBoardResolver) Run(ctx *types.Context) error {
 		return fmt.Errorf("%s: %w", tr("Error resolving FQBN"), err)
 	}
 
-	targetBoard.Properties = buildProperties // FIXME....
-
 	core := targetBoard.Properties.Get("build.core")
 	if core == "" {
 		core = "arduino"
@@ -46,6 +44,7 @@ func (s *TargetBoardResolver) Run(ctx *types.Context) error {
 
 	ctx.BuildCore = core
 	ctx.TargetBoard = targetBoard
+	ctx.TargetBoardBuildProperties = buildProperties
 	ctx.TargetPlatform = targetPlatform
 	ctx.TargetPackage = targetPackage
 	ctx.ActualPlatform = actualPlatform

diff --git a/legacy/builder/types/context.go b/legacy/builder/types/context.go
@@ -82,15 +82,16 @@ type Context struct {
 	BuildOptionsJson         string
 	BuildOptionsJsonPrevious string
 
-	PackageManager *packagemanager.PackageManager
-	Hardware       cores.Packages
-	AllTools       []*cores.ToolRelease
-	RequiredTools  []*cores.ToolRelease
-	TargetBoard    *cores.Board
-	TargetPackage  *cores.Package
-	TargetPlatform *cores.PlatformRelease
-	ActualPlatform *cores.PlatformRelease
-	USBVidPid      string
+	PackageManager             *packagemanager.PackageManager
+	Hardware                   cores.Packages
+	AllTools                   []*cores.ToolRelease
+	RequiredTools              []*cores.ToolRelease
+	TargetBoard                *cores.Board
+	TargetBoardBuildProperties *properties.Map
+	TargetPackage              *cores.Package
+	TargetPlatform             *cores.PlatformRelease
+	ActualPlatform             *cores.PlatformRelease
+	USBVidPid                  string
 
 	PlatformKeyRewrites    PlatforKeysRewrite
 	HardwareRewriteResults map[*cores.PlatformRelease][]PlatforKeyRewrite