@@ -121,7 +121,7 @@ func NewBuilder(
121
121
coreBuildCachePath * paths.Path ,
122
122
extraCoreBuildCachePaths paths.PathList ,
123
123
jobs int ,
124
- requestBuildProperties []string ,
124
+ customBuildProperties []string ,
125
125
hardwareDirs paths.PathList ,
126
126
librariesDirs paths.PathList ,
127
127
builtInLibrariesDirs * paths.Path ,
@@ -162,11 +162,11 @@ func NewBuilder(
162
162
}
163
163
164
164
// Add user provided custom build properties
165
- customBuildProperties , err := properties .LoadFromSlice (requestBuildProperties )
166
- if err != nil {
165
+ if p , err := properties .LoadFromSlice (customBuildProperties ); err == nil {
166
+ buildProperties .Merge (p )
167
+ } else {
167
168
return nil , fmt .Errorf ("invalid build properties: %w" , err )
168
169
}
169
- buildProperties .Merge (customBuildProperties )
170
170
171
171
sketchBuildPath , err := buildPath .Join ("sketch" ).Abs ()
172
172
if err != nil {
@@ -225,7 +225,7 @@ func NewBuilder(
225
225
hardwareDirs , librariesDirs ,
226
226
builtInLibrariesDirs , buildPath ,
227
227
sk ,
228
- requestBuildProperties ,
228
+ customBuildProperties ,
229
229
fqbn ,
230
230
clean ,
231
231
buildProperties .Get ("compiler.optimization_flags" ),
0 commit comments