Skip to content

Commit

Permalink
[release-branch.go1.8] cmd/link: disable mach-o dwarf munging with -w…
Browse files Browse the repository at this point in the history
… (in addition to -s)

Might as well provide a way around the mach-o munging
that doesn't require stripping all symbols.
After all, -w does mean no DWARF.

For #11887, #19734, and anyone else that needs to disable
this code path without losing the symbol table.

Change-Id: I254b7539f97fb9211fa90f446264b383e7f3980f
Reviewed-on: https://go-review.googlesource.com/39602
Run-TryBot: Austin Clements <austin@google.com>
Reviewed-by: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
  • Loading branch information
rsc authored and aclements committed Apr 5, 2017
1 parent 752b8b7 commit 84192f2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/cmd/link/internal/ld/lib.go
Expand Up @@ -1223,7 +1223,7 @@ func (l *Link) hostlink() {
l.Logf("%s", out)
}

if !*FlagS && !debug_s && Headtype == obj.Hdarwin {
if !*FlagS && !*FlagW && !debug_s && Headtype == obj.Hdarwin {
// Skip combining dwarf on arm.
if !SysArch.InFamily(sys.ARM, sys.ARM64) {
dsym := filepath.Join(*flagTmpdir, "go.dwarf")
Expand Down

0 comments on commit 84192f2

Please sign in to comment.