From 84192f2734c276baa3f2814d465eadc8eda82ce5 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 29 Mar 2017 20:46:20 -0400 Subject: [PATCH] [release-branch.go1.8] cmd/link: disable mach-o dwarf munging with -w (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 Reviewed-by: Russ Cox TryBot-Result: Gobot Gobot --- src/cmd/link/internal/ld/lib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go index a6ec97a9f9b6f..6e90d7857195a 100644 --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go @@ -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")