From abc34cf117c8d5bd85c18bd9642fd4b20eef308c Mon Sep 17 00:00:00 2001 From: Masala Date: Tue, 26 Sep 2023 13:17:10 +0000 Subject: [PATCH] gogio: add -tags to 'go list' command Signed-off-by: Masala --- gogio/androidbuild.go | 2 +- gogio/build_info.go | 4 ++-- gogio/iosbuild.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gogio/androidbuild.go b/gogio/androidbuild.go index 940b1a5..d559f19 100644 --- a/gogio/androidbuild.go +++ b/gogio/androidbuild.go @@ -240,7 +240,7 @@ func compileAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err erro return err }) } - appDir, err := runCmd(exec.Command("go", "list", "-f", "{{.Dir}}", "gioui.org/app/")) + appDir, err := runCmd(exec.Command("go", "list", "-tags", bi.tags, "-f", "{{.Dir}}", "gioui.org/app/")) if err != nil { return err } diff --git a/gogio/build_info.go b/gogio/build_info.go index 19b867f..32d5076 100644 --- a/gogio/build_info.go +++ b/gogio/build_info.go @@ -114,11 +114,11 @@ type packageMetadata struct { } func getPkgMetadata(pkgPath string) (*packageMetadata, error) { - pkgImportPath, err := runCmd(exec.Command("go", "list", "-f", "{{.ImportPath}}", pkgPath)) + pkgImportPath, err := runCmd(exec.Command("go", "list", "-tags", *extraTags, "-f", "{{.ImportPath}}", pkgPath)) if err != nil { return nil, err } - pkgDir, err := runCmd(exec.Command("go", "list", "-f", "{{.Dir}}", pkgPath)) + pkgDir, err := runCmd(exec.Command("go", "list", "-tags", *extraTags, "-f", "{{.Dir}}", pkgPath)) if err != nil { return nil, err } diff --git a/gogio/iosbuild.go b/gogio/iosbuild.go index f875fce..0612132 100644 --- a/gogio/iosbuild.go +++ b/gogio/iosbuild.go @@ -460,7 +460,7 @@ func archiveIOS(tmpDir, target, frameworkRoot string, bi *buildInfo) error { if _, err := runCmd(lipo); err != nil { return err } - appDir, err := runCmd(exec.Command("go", "list", "-f", "{{.Dir}}", "gioui.org/app/")) + appDir, err := runCmd(exec.Command("go", "list", "-tags", tags, "-f", "{{.Dir}}", "gioui.org/app/")) if err != nil { return err }