Skip to content

Commit aa98caa

Browse files
committed
Add global env to legacy package until it's ported to executils
1 parent d5e42d9 commit aa98caa

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

Diff for: legacy/builder/builder_utils/utils.go

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"strings"
2424
"sync"
2525

26+
"github.com/arduino/arduino-cli/executils"
2627
"github.com/arduino/arduino-cli/i18n"
2728
"github.com/arduino/arduino-cli/legacy/builder/constants"
2829
"github.com/arduino/arduino-cli/legacy/builder/types"
@@ -501,6 +502,7 @@ func PrepareCommandForRecipe(buildProperties *properties.Map, recipe string, rem
501502
return nil, errors.WithStack(err)
502503
}
503504
command := exec.Command(parts[0], parts[1:]...)
505+
command.Env = executils.GetProcessGlobalEnv()
504506

505507
// if the overall commandline is too long for the platform
506508
// try reducing the length by making the filenames relative

Diff for: legacy/builder/ctags_runner.go

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package builder
1818
import (
1919
"os/exec"
2020

21+
"github.com/arduino/arduino-cli/executils"
2122
"github.com/arduino/arduino-cli/legacy/builder/constants"
2223
"github.com/arduino/arduino-cli/legacy/builder/ctags"
2324
"github.com/arduino/arduino-cli/legacy/builder/types"
@@ -47,6 +48,8 @@ func (s *CTagsRunner) Run(ctx *types.Context) error {
4748
return errors.WithStack(err)
4849
}
4950
command := exec.Command(parts[0], parts[1:]...)
51+
command.Env = executils.GetProcessGlobalEnv()
52+
5053
sourceBytes, _, err := utils.ExecCommand(ctx, command, utils.Capture /* stdout */, utils.Ignore /* stderr */)
5154
if err != nil {
5255
return errors.WithStack(err)

Diff for: legacy/builder/preprocess_sketch.go

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"strings"
2424

2525
bldr "github.com/arduino/arduino-cli/arduino/builder"
26+
"github.com/arduino/arduino-cli/executils"
2627
"github.com/arduino/arduino-cli/legacy/builder/constants"
2728
"github.com/arduino/arduino-cli/legacy/builder/types"
2829
"github.com/arduino/arduino-cli/legacy/builder/utils"
@@ -109,6 +110,7 @@ func (s *ArduinoPreprocessorRunner) Run(ctx *types.Context) error {
109110
return errors.WithStack(err)
110111
}
111112
command := exec.Command(parts[0], parts[1:]...)
113+
command.Env = executils.GetProcessGlobalEnv()
112114

113115
if runtime.GOOS == "windows" {
114116
// chdir in the uppermost directory to avoid UTF-8 bug in clang (https://github.com/arduino/arduino-preprocessor/issues/2)

0 commit comments

Comments
 (0)