Skip to content

Commit 7af9663

Browse files
committed
Improved build.*.platform.path vars enumeration
1 parent 850f22a commit 7af9663

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

Diff for: internal/arduino/cores/packagemanager/package_manager.go

+5
Original file line numberDiff line numberDiff line change
@@ -372,12 +372,17 @@ func (pme *Explorer) ResolveFQBN(fqbn *cores.FQBN) (
372372

373373
// Add runtime build properties
374374
buildProperties.Merge(boardPlatformRelease.RuntimeProperties())
375+
buildProperties.SetPath("build.board.platform.path", boardPlatformRelease.InstallDir)
376+
buildProperties.SetPath("build.core.platform.path", corePlatformRelease.InstallDir)
375377
buildProperties.SetPath("build.core.path", corePlatformRelease.InstallDir.Join("cores", core))
376378
buildProperties.SetPath("build.system.path", corePlatformRelease.InstallDir.Join("system"))
377379
buildProperties.Set("build.variant.path", "")
378380
if variant != "" {
379381
buildProperties.SetPath("build.variant.path", variantPlatformRelease.InstallDir.Join("variants", variant))
380382
}
383+
if buildProperties.GetBoolean("build.use_core_platform_for_runtime_platform_path") {
384+
buildProperties.Set("runtime.platform.path", buildProperties.Get("build.core.platform.path"))
385+
}
381386

382387
for _, tool := range pme.GetAllInstalledToolsReleases() {
383388
buildProperties.Merge(tool.RuntimeProperties())

0 commit comments

Comments
 (0)