diff options
| author | Carlos Amedee <carlos@golang.org> | 2020-01-23 16:05:29 -0500 |
|---|---|---|
| committer | Carlos Amedee <carlos@golang.org> | 2020-02-26 17:04:18 +0000 |
| commit | 0e115a326648cd650f833a175c0505774413d9db (patch) | |
| tree | 965e1b4e56d91cf1c4ed14bd1054ea1a41204041 | |
| parent | 4169b1ea15139d00736cb616f122fef04adb2512 (diff) | |
| download | go-git-0e115a326648cd650f833a175c0505774413d9db.tar.gz | |
[release-branch.go1.13] cmd/link: ensure cgo cflags do not leak into dwarf tests
Running the dwarf tests with CGO_CFLAGS set
with certain values would cause the test to fail. all.bash
would fail when CGO_CFLAGS was set to '-mmacosx-version-min=10.10'
because the --macosx-version-min flag is incompatible with some dwarf
tests. The change guards against using an unintended flag in the unit test.
Updates #36846
Updates #35459
Change-Id: Idc9b354aba44fdab424cb0081a4b3ea7a6d0f8e3
Reviewed-on: https://go-review.googlesource.com/c/go/+/216177
Run-TryBot: Carlos Amedee <carlos@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
(cherry picked from commit e948d2b73ede67f12bff9e4d050f0e1425163010)
Reviewed-on: https://go-review.googlesource.com/c/go/+/217057
| -rw-r--r-- | src/cmd/link/dwarf_test.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cmd/link/dwarf_test.go b/src/cmd/link/dwarf_test.go index 897b2fc881..51b2d80960 100644 --- a/src/cmd/link/dwarf_test.go +++ b/src/cmd/link/dwarf_test.go @@ -71,6 +71,7 @@ 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...) } out, err := cmd.CombinedOutput() |