Skip to content

Commit abc34cf

Browse files
mixmasalaeliasnaur
authored andcommitted
gogio: add -tags to 'go list' command
Signed-off-by: Masala <[email protected]>
1 parent 7cb98d0 commit abc34cf

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

gogio/androidbuild.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ func compileAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err erro
240240
return err
241241
})
242242
}
243-
appDir, err := runCmd(exec.Command("go", "list", "-f", "{{.Dir}}", "gioui.org/app/"))
243+
appDir, err := runCmd(exec.Command("go", "list", "-tags", bi.tags, "-f", "{{.Dir}}", "gioui.org/app/"))
244244
if err != nil {
245245
return err
246246
}

gogio/build_info.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ type packageMetadata struct {
114114
}
115115

116116
func getPkgMetadata(pkgPath string) (*packageMetadata, error) {
117-
pkgImportPath, err := runCmd(exec.Command("go", "list", "-f", "{{.ImportPath}}", pkgPath))
117+
pkgImportPath, err := runCmd(exec.Command("go", "list", "-tags", *extraTags, "-f", "{{.ImportPath}}", pkgPath))
118118
if err != nil {
119119
return nil, err
120120
}
121-
pkgDir, err := runCmd(exec.Command("go", "list", "-f", "{{.Dir}}", pkgPath))
121+
pkgDir, err := runCmd(exec.Command("go", "list", "-tags", *extraTags, "-f", "{{.Dir}}", pkgPath))
122122
if err != nil {
123123
return nil, err
124124
}

gogio/iosbuild.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ func archiveIOS(tmpDir, target, frameworkRoot string, bi *buildInfo) error {
460460
if _, err := runCmd(lipo); err != nil {
461461
return err
462462
}
463-
appDir, err := runCmd(exec.Command("go", "list", "-f", "{{.Dir}}", "gioui.org/app/"))
463+
appDir, err := runCmd(exec.Command("go", "list", "-tags", tags, "-f", "{{.Dir}}", "gioui.org/app/"))
464464
if err != nil {
465465
return err
466466
}

0 commit comments

Comments
 (0)