From 8fbf9c6e361d0e405938955f51e9c114ac2ccfc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20Wegm=C3=BCller?= Date: Thu, 28 Jul 2022 14:03:33 -0300 Subject: [PATCH 1/2] Make sure user_other is excluded when user_posix should be used --- user_other.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_other.go b/user_other.go index 3dae8f55..dfba6f33 100644 --- a/user_other.go +++ b/user_other.go @@ -1,7 +1,7 @@ // Package pq is a pure Go Postgres driver for the database/sql package. -//go:build js || android || hurd || zos -// +build js android hurd zos +//go:build js || android || hurd || zos || !solaris || !illumos +// +build js android hurd zos !solaris !illumos package pq From ba3651763336db9c73414435ce81834773c121f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20Wegm=C3=BCller?= Date: Thu, 28 Jul 2022 14:20:59 -0300 Subject: [PATCH 2/2] Complete buildtags as inverse mirror of user_posix --- user_other.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/user_other.go b/user_other.go index dfba6f33..7add3e85 100644 --- a/user_other.go +++ b/user_other.go @@ -1,7 +1,11 @@ // Package pq is a pure Go Postgres driver for the database/sql package. -//go:build js || android || hurd || zos || !solaris || !illumos -// +build js android hurd zos !solaris !illumos +// For some reason the current setup with the build tags causes this version of the userCurrent to be defined twice on at least illumos +// (thus porbably solaris aswell) to make the exclusion explicit the build tags listed here are an inverted mirror of those used in user_posix +// user_windows still provides the function on windows NT based platforms. + +//go:build js || android || hurd || zos || !aix || !darwin || !dragonfly || !freebsd || !nacl || !netbsd || !openbsd || !plan9 || !solaris || !rumprun || !illumos +// +build js android hurd zos !aix !darwin !dragonfly !freebsd !nacl !netbsd !openbsd !plan9 !solaris !rumprun !illumos package pq