NotificationsYou must be signed in to change notification settings
Fork446
Star4.7k

Commit98fa9f3

authored

fix: build.options now have the full path to used platforms (#3042)

Previously the path to the folder containing the platforms was used,(for exmaple, `/home/cmaglie/.arduino15/packages` instead of`/home/cmaglie/.arduino15/packages/arduino/hardware/avr/1.8.6`).This kept the build.options unchanged even if a platform was updated,leading to a possible cache-reuse even if a full rebuild is required.

1 parent369a239 commit98fa9f3Copy full SHA for 98fa9f3

File tree

2 files changed

-3

lines changed

commands
- service_compile.go
internal/arduino/builder
- builder.go

2 files changed

-3

lines changed

`‎commands/service_compile.go‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,6 @@ func (s arduinoCoreServerImpl) Compile(req rpc.CompileRequest, stream rpc.Ardu`
`264`	`264`	`extraCoreBuildCachePaths,`
`265`	`265`	`int(req.GetJobs()),`
`266`	`266`	`req.GetBuildProperties(),`
`267`		`-s.settings.HardwareDirectories(),`
`268`	`267`	`librariesDirs,`
`269`	`268`	`s.settings.IDEBuiltinLibrariesDir(),`
`270`	`269`	`fqbn,`

`‎internal/arduino/builder/builder.go‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,6 @@ func NewBuilder(`
`123`	`123`	`extraCoreBuildCachePaths paths.PathList,`
`124`	`124`	`jobsint,`
`125`	`125`	`customBuildProperties []string,`
`126`		`-hardwareDirs paths.PathList,`
`127`	`126`	`librariesDirs paths.PathList,`
`128`	`127`	`builtInLibrariesDirs*paths.Path,`
`129`	`128`	`fqbn*fqbn.FQBN,`
`@@ -225,7 +224,7 @@ func NewBuilder(`
`225`	`224`	`buildPlatform:buildPlatform,`
`226`	`225`	`toolEnv:toolEnv,`
`227`	`226`	`buildOptions:newBuildOptions(`
`228`		`-hardwareDirs,`
	`227`	`+paths.PathList{targetPlatform.InstallDir,buildPlatform.InstallDir},`
`229`	`228`	`librariesDirs,`
`230`	`229`	`builtInLibrariesDirs,`
`231`	`230`	`buildPath,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit98fa9f3

File tree

2 files changed

2 files changed

`‎commands/service_compile.go‎`

`‎internal/arduino/builder/builder.go‎`

0 commit comments