Skip to content

Commit

Permalink
cmd/go: fix -n output in runtime/internal/atomic
Browse files Browse the repository at this point in the history
When building runtime/internal/atomic, the toolchain writes a symabis2
file. This file is read back in, filtered, and appended to the symabis
file. This breaks with -n, since the symabis2 file is never written.

With this change, when -n is used, an equivalent "grep" command is
printed instead. The output for -x is unchanged.

Fixes #29346

Change-Id: Id25e06e06364fc6689e71660d000f09c649c4f0c
Reviewed-on: https://go-review.googlesource.com/c/155480
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Run-TryBot: Bryan C. Mills <bcmills@google.com>
  • Loading branch information
Jay Conrod committed Dec 21, 2018
1 parent 429bae7 commit 0005515
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/cmd/go/internal/work/gc.go
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,12 @@ func (gcToolchain) symabis(b *Builder, a *Action, sfiles []string) (string, erro

// Filter out just the symbol refs and append them to
// the symabis file.
if cfg.BuildN {
// -x will print the lines from symabis2 that are actually appended
// to symabis. With -n, we don't know what those lines will be.
b.Showcmd("", `grep '^ref' <%s | grep -v '^ref\s*""\.' >>%s`, symabis2, a.Objdir+"symabis")
continue
}
abis2, err := ioutil.ReadFile(symabis2)
if err != nil {
return "", err
Expand Down
4 changes: 4 additions & 0 deletions src/cmd/go/testdata/script/build_runtime_gcflags.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# This test verifies the standard library (specifically runtime/internal/atomic)
# can be built with -gcflags when -n is given. See golang.org/issue/26092.
go build -n -gcflags=all='-l' std
stderr 'compile.* -l .* runtime/internal/atomic'

0 comments on commit 0005515

Please sign in to comment.