浏览代码

Remove extra version check on GNU objdump (#554)

Garrett Wang 5 年前
父节点
当前提交
1a94d8640e
没有帐户链接到提交者的电子邮件
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1
    1
      internal/binutils/binutils.go
  2. 1
    1
      internal/binutils/binutils_test.go

+ 1
- 1
internal/binutils/binutils.go 查看文件

233
 // and returns a boolean indicating if the given binary is a GNU
233
 // and returns a boolean indicating if the given binary is a GNU
234
 // binutils objdump binary. No version check is performed.
234
 // binutils objdump binary. No version check is performed.
235
 func isBuObjdump(output string) bool {
235
 func isBuObjdump(output string) bool {
236
-	return strings.Contains(output, "GNU objdump") && strings.Contains(output, "Binutils")
236
+	return strings.Contains(output, "GNU objdump")
237
 }
237
 }
238
 
238
 
239
 // findExe looks for an executable command on a set of paths.
239
 // findExe looks for an executable command on a set of paths.

+ 1
- 1
internal/binutils/binutils_test.go 查看文件

494
 		},
494
 		},
495
 		{
495
 		{
496
 			desc: "Invalid GNU objdump version string",
496
 			desc: "Invalid GNU objdump version string",
497
-			ver:  "GNU objdump (GNU Banutils) 2.34\nCopyright (C) 2020 Free Software Foundation, Inc.",
497
+			ver:  "GNU nm (GNU Binutils) 2.34\nCopyright (C) 2020 Free Software Foundation, Inc.",
498
 			want: false,
498
 			want: false,
499
 		},
499
 		},
500
 	} {
500
 	} {