Skip to content

Commit 3246db0

Browse files
committed
Reordered properties construction for clarity
1 parent e805906 commit 3246db0

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

Diff for: internal/arduino/builder/compilation.go

+6-8
Original file line numberDiff line numberDiff line change
@@ -119,20 +119,13 @@ func (b *Builder) compileFileWithRecipe(
119119
includes []string,
120120
recipe string,
121121
) (*paths.Path, error) {
122-
properties := b.buildProperties.Clone()
123-
properties.Set("compiler.warning_flags", properties.Get("compiler.warning_flags."+b.logger.WarningsLevel()))
124-
properties.Set("includes", strings.Join(includes, " "))
125-
properties.SetPath("source_file", source)
126122
relativeSource, err := sourcePath.RelTo(source)
127123
if err != nil {
128124
return nil, err
129125
}
130126
depsFile := buildPath.Join(relativeSource.String() + ".d")
131127
objectFile := buildPath.Join(relativeSource.String() + ".o")
132-
133-
properties.SetPath("object_file", objectFile)
134-
err = objectFile.Parent().MkdirAll()
135-
if err != nil {
128+
if err := objectFile.Parent().MkdirAll(); err != nil {
136129
return nil, err
137130
}
138131

@@ -141,6 +134,11 @@ func (b *Builder) compileFileWithRecipe(
141134
return nil, err
142135
}
143136

137+
properties := b.buildProperties.Clone()
138+
properties.Set("compiler.warning_flags", properties.Get("compiler.warning_flags."+b.logger.WarningsLevel()))
139+
properties.Set("includes", strings.Join(includes, " "))
140+
properties.SetPath("source_file", source)
141+
properties.SetPath("object_file", objectFile)
144142
command, err := b.prepareCommandForRecipe(properties, recipe, false)
145143
if err != nil {
146144
return nil, err

0 commit comments

Comments
 (0)