Skip to content

Commit 62b072d

Browse files
author
Federico Fissore
committed
HOOKS_PREBUILD recipe was called before having read hardware definitions. Fixed
Signed-off-by: Federico Fissore <[email protected]>
1 parent d950328 commit 62b072d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Diff for: src/arduino.cc/builder/builder.go

+2
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ func (s *Builder) Run(context map[string]interface{}) error {
7575

7676
&ContainerBuildOptions{},
7777

78+
&RecipeByPrefixSuffixRunner{Prefix: constants.HOOKS_PREBUILD, Suffix: constants.HOOKS_PATTERN_SUFFIX},
79+
7880
&ContainerMergeCopySketchFiles{},
7981

8082
&ContainerFindIncludes{},

Diff for: src/arduino.cc/builder/container_setup.go

-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
3433
"arduino.cc/builder/types"
3534
"arduino.cc/builder/utils"
3635
)
@@ -41,7 +40,6 @@ func (s *ContainerSetupHardwareToolsLibsSketchAndProps) Run(context map[string]i
4140
commands := []types.Command{
4241
&AddAdditionalEntriesToContext{},
4342
&FailIfBuildPathEqualsSketchPath{},
44-
&RecipeByPrefixSuffixRunner{Prefix: constants.HOOKS_PREBUILD, Suffix: constants.HOOKS_PATTERN_SUFFIX},
4543
&HardwareLoader{},
4644
&PlatformKeysRewriteLoader{},
4745
&RewriteHardwareKeys{},

0 commit comments

Comments
 (0)