From 7be61e1b0e514e106d83fc439d56a79143738603 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Thu, 23 May 2019 19:47:01 +0000 Subject: [PATCH] cmd/splitdwarf: fix skip on Windows Unify the two files rather than have to maintain two copies of the +build line. Fixes golang/go#32212 Change-Id: I1f9ee4956183aa6248a5a2e83b5760d02532bacb Reviewed-on: https://go-review.googlesource.com/c/tools/+/178699 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: David Chase --- cmd/splitdwarf/doc.go | 19 ------------------- cmd/splitdwarf/splitdwarf.go | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 cmd/splitdwarf/doc.go diff --git a/cmd/splitdwarf/doc.go b/cmd/splitdwarf/doc.go deleted file mode 100644 index 7799f420ae..0000000000 --- a/cmd/splitdwarf/doc.go +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2018 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -/* - -Splitdwarf uncompresses and copies the DWARF segment of a Mach-O -executable into the "dSYM" file expected by lldb and ports of gdb -on OSX. - -Usage: splitdwarf osxMachoFile [ osxDsymFile ] - -Unless a dSYM file name is provided on the command line, -splitdwarf will place it where the OSX tools expect it, in -".dSYM/Contents/Resources/DWARF/", -creating directories as necessary. - -*/ -package main // import "golang.org/x/tools/cmd/splitdwarf" diff --git a/cmd/splitdwarf/splitdwarf.go b/cmd/splitdwarf/splitdwarf.go index a91c8f8d35..44e7a7a7b8 100644 --- a/cmd/splitdwarf/splitdwarf.go +++ b/cmd/splitdwarf/splitdwarf.go @@ -4,7 +4,21 @@ // +build !js,!nacl,!plan9,!solaris,!windows -package main +/* + +Splitdwarf uncompresses and copies the DWARF segment of a Mach-O +executable into the "dSYM" file expected by lldb and ports of gdb +on OSX. + +Usage: splitdwarf osxMachoFile [ osxDsymFile ] + +Unless a dSYM file name is provided on the command line, +splitdwarf will place it where the OSX tools expect it, in +".dSYM/Contents/Resources/DWARF/", +creating directories as necessary. + +*/ +package main // import "golang.org/x/tools/cmd/splitdwarf" import ( "crypto/sha256"