Skip to content

Commit 98fa9f3

Browse files
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 parent 369a239 commit 98fa9f3

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

commands/service_compile.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ func (s *arduinoCoreServerImpl) Compile(req *rpc.CompileRequest, stream rpc.Ardu
264264
extraCoreBuildCachePaths,
265265
int(req.GetJobs()),
266266
req.GetBuildProperties(),
267-
s.settings.HardwareDirectories(),
268267
librariesDirs,
269268
s.settings.IDEBuiltinLibrariesDir(),
270269
fqbn,

internal/arduino/builder/builder.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ func NewBuilder(
123123
extraCoreBuildCachePaths paths.PathList,
124124
jobs int,
125125
customBuildProperties []string,
126-
hardwareDirs paths.PathList,
127126
librariesDirs paths.PathList,
128127
builtInLibrariesDirs *paths.Path,
129128
fqbn *fqbn.FQBN,
@@ -225,7 +224,7 @@ func NewBuilder(
225224
buildPlatform: buildPlatform,
226225
toolEnv: toolEnv,
227226
buildOptions: newBuildOptions(
228-
hardwareDirs,
227+
paths.PathList{targetPlatform.InstallDir, buildPlatform.InstallDir},
229228
librariesDirs,
230229
builtInLibrariesDirs,
231230
buildPath,

0 commit comments

Comments
 (0)