]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/compile: pass process env to 'go tool compile' in compileToAsm
authorMichael Hudson-Doyle <michael.hudson@canonical.com>
Wed, 1 Jun 2016 01:32:53 +0000 (13:32 +1200)
committerMichael Hudson-Doyle <michael.hudson@canonical.com>
Wed, 1 Jun 2016 03:55:09 +0000 (03:55 +0000)
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>
src/cmd/compile/internal/gc/asm_test.go

index 469f0864d5c35faebf1198f75d3036bbd9da6a3a..73d2e336d225b22ff0fb92500b9f6957aae7fe8d 100644 (file)
@@ -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 {