From 3fbab2ede38fc21d6e3f8f3475564e86a9a7b5e6 Mon Sep 17 00:00:00 2001 From: Dan Kegel Date: Mon, 24 Jan 2022 15:00:06 -0800 Subject: [PATCH] builder/buildid.go: accept alternate name for buildid section on Linux On Ubuntu, using standard go, both go and gnu buildid sections are present. On Alpine, the gnu buildid section is absent, which caused tinygo to abort early. It is possible that we could hit a situation where only the gnu buildid section is present, so accept either one just in case. Fixes https://github.com/tinygo-org/tinygo/issues/2580 --- builder/buildid.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builder/buildid.go b/builder/buildid.go index e5529c5d..e23c75f5 100644 --- a/builder/buildid.go +++ b/builder/buildid.go @@ -31,7 +31,8 @@ func ReadBuildID() ([]byte, error) { return nil, err } for _, section := range file.Sections { - if section.Type != elf.SHT_NOTE || section.Name != ".note.gnu.build-id" { + if section.Type != elf.SHT_NOTE || + (section.Name != ".note.gnu.build-id" && section.Name != ".note.go.buildid") { continue } buf := make([]byte, section.Size)