From 032dfd515a0b058cc9bc616139b136f923d3924a Mon Sep 17 00:00:00 2001 From: griesemer Date: Thu, 2 Nov 2017 15:51:16 -0700 Subject: [PATCH] cmd/toolstash: don't try comparing "asm -V=full" output. Added link as well, since they are all symmetric. Follow-up on https://go-review.googlesource.com/c/tools/+/75670. For golang/go#22552. Change-Id: I12d951b800cd5fc7abc6d09e6a8a986e3f9f6936 Reviewed-on: https://go-review.googlesource.com/75672 Reviewed-by: Matthew Dempsky --- cmd/toolstash/main.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cmd/toolstash/main.go b/cmd/toolstash/main.go index 015ed13dc2..da56361f56 100644 --- a/cmd/toolstash/main.go +++ b/cmd/toolstash/main.go @@ -176,15 +176,12 @@ var ( func canCmp(name string, args []string) bool { switch name { - case "compile": + case "asm", "compile", "link": if len(args) == 1 && (args[0] == "-V" || strings.HasPrefix(args[0], "-V=")) { - // cmd/go uses "compile -V=full" to query the - // compiler's build ID. + // cmd/go uses "compile -V=full" to query the tool's build ID. return false } return true - case "link", "asm": - return true } return len(name) == 2 && '0' <= name[0] && name[0] <= '9' && (name[1] == 'a' || name[1] == 'g' || name[1] == 'l') }