Improved build.*.platform.path vars enumeration

arduino · Jun 25, 2024 · 7af9663 · 7af9663
1 parent 850f22a
commit 7af9663
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/internal/arduino/cores/packagemanager/package_manager.go b/internal/arduino/cores/packagemanager/package_manager.go
@@ -372,12 +372,17 @@ func (pme *Explorer) ResolveFQBN(fqbn *cores.FQBN) (
 
 	// Add runtime build properties
 	buildProperties.Merge(boardPlatformRelease.RuntimeProperties())
+	buildProperties.SetPath("build.board.platform.path", boardPlatformRelease.InstallDir)
+	buildProperties.SetPath("build.core.platform.path", corePlatformRelease.InstallDir)
 	buildProperties.SetPath("build.core.path", corePlatformRelease.InstallDir.Join("cores", core))
 	buildProperties.SetPath("build.system.path", corePlatformRelease.InstallDir.Join("system"))
 	buildProperties.Set("build.variant.path", "")
 	if variant != "" {
 		buildProperties.SetPath("build.variant.path", variantPlatformRelease.InstallDir.Join("variants", variant))
 	}
+	if buildProperties.GetBoolean("build.use_core_platform_for_runtime_platform_path") {
+		buildProperties.Set("runtime.platform.path", buildProperties.Get("build.core.platform.path"))
+	}
 
 	for _, tool := range pme.GetAllInstalledToolsReleases() {
 		buildProperties.Merge(tool.RuntimeProperties())