From c506f027635742efcb4e5dc2cbcb20b9f4a22567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 10 Jan 2022 10:37:53 +0000
Subject: [PATCH] handle --long build flags properly

cmd/go treats "--foo=bar" juts like "-foo=bar",
just like any other program using the flag package.

However, we didn't support this longer form in filterForwardBuildFlags.
Because of it, "garble build -tags=foo" worked,
but "garble build --tags=foo" did not,
as we wouldn't forward "--tags=foo" as a build flag for "go list".

Fixes #429.
---
 main.go                      | 5 ++++-
 testdata/scripts/imports.txt | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/main.go b/main.go
index 6ead7a0..238847a 100644
--- a/main.go
+++ b/main.go
@@ -1880,7 +1880,10 @@ func filterForwardBuildFlags(flags []string) (filtered []string, firstUnknown st
 		arg := flags[i]
 		name := arg
 		if i := strings.IndexByte(arg, '='); i > 0 {
-			name = arg[:i]
+			name = arg[:i] // "-name=value" to "-name"
+		}
+		if strings.HasPrefix(name, "--") {
+			name = name[1:] // "--name" to "-name"
 		}
 
 		buildFlag := forwardBuildFlags[name]
diff --git a/testdata/scripts/imports.txt b/testdata/scripts/imports.txt
index e21051a..4d83b75 100644
--- a/testdata/scripts/imports.txt
+++ b/testdata/scripts/imports.txt
@@ -36,8 +36,9 @@ go build -tags buildtag
 exec ./main
 cmp stdout main.stdout
 
-# Also check that -literals doesn't break anything
-garble -literals build -tags buildtag
+# Check that -literals doesn't break anything.
+# Also check that a different form of -tags still works.
+garble -literals build --tags=buildtag
 exec ./main
 cmp stdout main.stdout