cmd/link: fix data race in testDWARF

Multiple instances of testDWARF run in parallel, with a shared backing store of the env input slice. Do modification of the environment locally, instead of on the shared slice. Fixes #38265. Change-Id: I22a7194c8cd55ba22c9d6c47ac47bf7e710a7027 Reviewed-on: https://go-review.googlesource.com/c/go/+/227342 Run-TryBot: Cherry Zhang <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]> Reviewed-by: Josh Bleecher Snyder <[email protected]> TryBot-Result: Gobot Gobot <[email protected]>
golang · Apr 6, 2020 · 23866ae · 23866ae
1 parent 44ae947
commit 23866ae
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/cmd/link/dwarf_test.go b/src/cmd/link/dwarf_test.go
@@ -71,8 +71,8 @@ func testDWARF(t *testing.T, buildmode string, expectDWARF bool, env ...string)
 			}
 			cmd.Args = append(cmd.Args, dir)
 			if env != nil {
-				env = append(env, "CGO_CFLAGS=") // ensure CGO_CFLAGS does not contain any flags. Issue #35459
 				cmd.Env = append(os.Environ(), env...)
+				cmd.Env = append(cmd.Env, "CGO_CFLAGS=") // ensure CGO_CFLAGS does not contain any flags. Issue #35459
 			}
 			out, err := cmd.CombinedOutput()
 			if err != nil {