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