From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Wed, 1 Jun 2016 01:32:53 +0000 (+1200)
Subject: cmd/compile: pass process env to 'go tool compile' in compileToAsm
X-Git-Tag: go1.7beta1~16
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=2885e07c259ffda336d6965fcca03b4df617d812;p=gostls13.git

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>
---

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 {