diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/internal/obj/x86/obj6_test.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/cmd/internal/obj/x86/obj6_test.go b/src/cmd/internal/obj/x86/obj6_test.go index 93f8f3c262..7b64fe962b 100644 --- a/src/cmd/internal/obj/x86/obj6_test.go +++ b/src/cmd/internal/obj/x86/obj6_test.go @@ -97,8 +97,13 @@ func asmOutput(t *testing.T, s string) []byte { if err != nil { t.Fatal(err) } + gofolder := filepath.Join(build.Default.GOROOT, "bin") + if gobin := os.Getenv("GOBIN"); len(gobin) != 0 { + gofolder = gobin + } + cmd := exec.Command( - build.Default.GOROOT+"/bin/go", "tool", "asm", "-S", "-dynlink", + filepath.Join(gofolder, "go"), "tool", "asm", "-S", "-dynlink", "-o", filepath.Join(tmpdir, "output.6"), tmpfile.Name()) var env []string |