os/user: fix build with "osusergo" build tag

Fixes #24841
Updates #24845

Change-Id: I4a5c05f4cbf9692bd6cab48baf3cc51fa43fe5a9
Reviewed-on: https://go-review.googlesource.com/106837
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/os/user/cgo_unix_test.go b/src/os/user/cgo_unix_test.go
index 674111800fbe6e8393eb8fe8be994498eec336c0..1d341aa427d4cb42aa794efbf09a844e4003a041 100644 (file)
--- a/src/os/user/cgo_unix_test.go
+++ b/src/os/user/cgo_unix_test.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build darwin dragonfly freebsd !android,linux netbsd openbsd solaris
-// +build cgo
+// +build cgo,!osusergo
 
 package user
 

diff --git a/src/os/user/getgrouplist_unix.go b/src/os/user/getgrouplist_unix.go
index 8ad51286c6f0c1dd4bbce3ac6aeb86401e201d77..9685414fc0221d8b686ac4dc845b541dc474ba4a 100644 (file)
--- a/src/os/user/getgrouplist_unix.go
+++ b/src/os/user/getgrouplist_unix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build dragonfly freebsd !android,linux netbsd openbsd
+// +build cgo,!osusergo
 
 package user