diff options
| author | Michael Hudson-Doyle <michael.hudson@canonical.com> | 2016-06-01 13:32:53 +1200 |
|---|---|---|
| committer | Michael Hudson-Doyle <michael.hudson@canonical.com> | 2016-06-01 03:55:09 +0000 |
| commit | 2885e07c259ffda336d6965fcca03b4df617d812 (patch) | |
| tree | 000b4441e9934a3a6b03d3bd2ae42cf52c9ac6ff | |
| parent | 04acd625d7a1044c8ca78464f6727276577ffb3d (diff) | |
| download | go-2885e07c259ffda336d6965fcca03b4df617d812.tar.gz go-2885e07c259ffda336d6965fcca03b4df617d812.zip | |
cmd/compile: pass process env to 'go tool compile' in compileToAsm
In particular, this stops the test failing when GOROOT and GOROOT_FINAL are
different.
Change-Id: Ibf6cc0a173f1d965ee8aa31eee2698b223f1ceec
Reviewed-on: https://go-review.googlesource.com/23620
Run-TryBot: Michael Hudson-Doyle <michael.hudson@canonical.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
| -rw-r--r-- | src/cmd/compile/internal/gc/asm_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/compile/internal/gc/asm_test.go b/src/cmd/compile/internal/gc/asm_test.go index 469f0864d5..73d2e336d2 100644 --- a/src/cmd/compile/internal/gc/asm_test.go +++ b/src/cmd/compile/internal/gc/asm_test.go @@ -61,7 +61,7 @@ func compileToAsm(dir, arch, pkg string) string { var stdout, stderr bytes.Buffer cmd := exec.Command("go", "tool", "compile", "-S", "-o", filepath.Join(dir, "out.o"), src) - cmd.Env = append(cmd.Env, "GOARCH="+arch) + cmd.Env = append([]string{"GOARCH=" + arch}, os.Environ()...) cmd.Stdout = &stdout cmd.Stderr = &stderr if err := cmd.Run(); err != nil { |