diff options
| author | Joshua M. Clulow <josh.clulow@joyent.com> | 2019-04-29 13:50:49 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2019-04-30 16:59:13 +0000 |
| commit | f686a2890b34996455c7d7aba9a0efba74b613f5 (patch) | |
| tree | d2f0348349a47f4697fb4dacdf687455cec4546a /src/runtime/internal | |
| parent | 0c9e0c257b121acae72b9419be64ce45196ef825 (diff) | |
| download | go-f686a2890b34996455c7d7aba9a0efba74b613f5.tar.xz | |
all: add new GOOS=illumos, split out of GOOS=solaris
Like GOOS=android which implies the "linux" build tag, GOOS=illumos
implies the "solaris" build tag. This lets the existing ecosystem of
packages still work on illumos, but still permits packages to start
differentiating between solaris and illumos.
Fixes #20603
Change-Id: I8f4eabf1a66060538dca15d7658c1fbc6c826622
Reviewed-on: https://go-review.googlesource.com/c/go/+/174457
Run-TryBot: Benny Siegert <bsiegert@gmail.com>
Reviewed-by: Benny Siegert <bsiegert@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/runtime/internal')
| -rw-r--r-- | src/runtime/internal/sys/gengoos.go | 3 | ||||
| -rw-r--r-- | src/runtime/internal/sys/zgoos_aix.go | 1 | ||||
| -rw-r--r-- | src/runtime/internal/sys/zgoos_android.go | 1 | ||||
| -rw-r--r-- | src/runtime/internal/sys/zgoos_darwin.go | 1 | ||||
| -rw-r--r-- | src/runtime/internal/sys/zgoos_dragonfly.go | 1 | ||||
| -rw-r--r-- | src/runtime/internal/sys/zgoos_freebsd.go | 1 | ||||
| -rw-r--r-- | src/runtime/internal/sys/zgoos_hurd.go | 1 | ||||
| -rw-r--r-- | src/runtime/internal/sys/zgoos_illumos.go | 24 | ||||
| -rw-r--r-- | src/runtime/internal/sys/zgoos_js.go | 1 | ||||
| -rw-r--r-- | src/runtime/internal/sys/zgoos_linux.go | 1 | ||||
| -rw-r--r-- | src/runtime/internal/sys/zgoos_nacl.go | 1 | ||||
| -rw-r--r-- | src/runtime/internal/sys/zgoos_netbsd.go | 1 | ||||
| -rw-r--r-- | src/runtime/internal/sys/zgoos_openbsd.go | 1 | ||||
| -rw-r--r-- | src/runtime/internal/sys/zgoos_plan9.go | 1 | ||||
| -rw-r--r-- | src/runtime/internal/sys/zgoos_solaris.go | 2 | ||||
| -rw-r--r-- | src/runtime/internal/sys/zgoos_windows.go | 1 | ||||
| -rw-r--r-- | src/runtime/internal/sys/zgoos_zos.go | 1 |
17 files changed, 43 insertions, 0 deletions
diff --git a/src/runtime/internal/sys/gengoos.go b/src/runtime/internal/sys/gengoos.go index d078921874..952b13649d 100644 --- a/src/runtime/internal/sys/gengoos.go +++ b/src/runtime/internal/sys/gengoos.go @@ -49,6 +49,9 @@ func main() { if target == "linux" { fmt.Fprintf(&buf, "// +build !android\n") // must explicitly exclude android for linux } + if target == "solaris" { + fmt.Fprintf(&buf, "// +build !illumos\n") // must explicitly exclude illumos for solaris + } fmt.Fprintf(&buf, "// +build %s\n\n", target) // must explicitly include target for bootstrapping purposes fmt.Fprintf(&buf, "package sys\n\n") fmt.Fprintf(&buf, "const GOOS = `%s`\n\n", target) diff --git a/src/runtime/internal/sys/zgoos_aix.go b/src/runtime/internal/sys/zgoos_aix.go index 909bfc5e93..d97485c43c 100644 --- a/src/runtime/internal/sys/zgoos_aix.go +++ b/src/runtime/internal/sys/zgoos_aix.go @@ -12,6 +12,7 @@ const GoosDarwin = 0 const GoosDragonfly = 0 const GoosFreebsd = 0 const GoosHurd = 0 +const GoosIllumos = 0 const GoosJs = 0 const GoosLinux = 0 const GoosNacl = 0 diff --git a/src/runtime/internal/sys/zgoos_android.go b/src/runtime/internal/sys/zgoos_android.go index 434ce46712..eec970b064 100644 --- a/src/runtime/internal/sys/zgoos_android.go +++ b/src/runtime/internal/sys/zgoos_android.go @@ -12,6 +12,7 @@ const GoosDarwin = 0 const GoosDragonfly = 0 const GoosFreebsd = 0 const GoosHurd = 0 +const GoosIllumos = 0 const GoosJs = 0 const GoosLinux = 0 const GoosNacl = 0 diff --git a/src/runtime/internal/sys/zgoos_darwin.go b/src/runtime/internal/sys/zgoos_darwin.go index b645d1cf5f..c40819ee55 100644 --- a/src/runtime/internal/sys/zgoos_darwin.go +++ b/src/runtime/internal/sys/zgoos_darwin.go @@ -12,6 +12,7 @@ const GoosDarwin = 1 const GoosDragonfly = 0 const GoosFreebsd = 0 const GoosHurd = 0 +const GoosIllumos = 0 const GoosJs = 0 const GoosLinux = 0 const GoosNacl = 0 diff --git a/src/runtime/internal/sys/zgoos_dragonfly.go b/src/runtime/internal/sys/zgoos_dragonfly.go index 154cec370f..3dc4edcc31 100644 --- a/src/runtime/internal/sys/zgoos_dragonfly.go +++ b/src/runtime/internal/sys/zgoos_dragonfly.go @@ -12,6 +12,7 @@ const GoosDarwin = 0 const GoosDragonfly = 1 const GoosFreebsd = 0 const GoosHurd = 0 +const GoosIllumos = 0 const GoosJs = 0 const GoosLinux = 0 const GoosNacl = 0 diff --git a/src/runtime/internal/sys/zgoos_freebsd.go b/src/runtime/internal/sys/zgoos_freebsd.go index 5f41c03445..6c98b342f9 100644 --- a/src/runtime/internal/sys/zgoos_freebsd.go +++ b/src/runtime/internal/sys/zgoos_freebsd.go @@ -12,6 +12,7 @@ const GoosDarwin = 0 const GoosDragonfly = 0 const GoosFreebsd = 1 const GoosHurd = 0 +const GoosIllumos = 0 const GoosJs = 0 const GoosLinux = 0 const GoosNacl = 0 diff --git a/src/runtime/internal/sys/zgoos_hurd.go b/src/runtime/internal/sys/zgoos_hurd.go index 53f7fc384b..d6dcc7bad4 100644 --- a/src/runtime/internal/sys/zgoos_hurd.go +++ b/src/runtime/internal/sys/zgoos_hurd.go @@ -12,6 +12,7 @@ const GoosDarwin = 0 const GoosDragonfly = 0 const GoosFreebsd = 0 const GoosHurd = 1 +const GoosIllumos = 0 const GoosJs = 0 const GoosLinux = 0 const GoosNacl = 0 diff --git a/src/runtime/internal/sys/zgoos_illumos.go b/src/runtime/internal/sys/zgoos_illumos.go new file mode 100644 index 0000000000..17f4ecc34e --- /dev/null +++ b/src/runtime/internal/sys/zgoos_illumos.go @@ -0,0 +1,24 @@ +// Code generated by gengoos.go using 'go generate'. DO NOT EDIT. + +// +build illumos + +package sys + +const GOOS = `illumos` + +const GoosAix = 0 +const GoosAndroid = 0 +const GoosDarwin = 0 +const GoosDragonfly = 0 +const GoosFreebsd = 0 +const GoosHurd = 0 +const GoosIllumos = 1 +const GoosJs = 0 +const GoosLinux = 0 +const GoosNacl = 0 +const GoosNetbsd = 0 +const GoosOpenbsd = 0 +const GoosPlan9 = 0 +const GoosSolaris = 0 +const GoosWindows = 0 +const GoosZos = 0 diff --git a/src/runtime/internal/sys/zgoos_js.go b/src/runtime/internal/sys/zgoos_js.go index c6cca49bd9..74c9943d9b 100644 --- a/src/runtime/internal/sys/zgoos_js.go +++ b/src/runtime/internal/sys/zgoos_js.go @@ -12,6 +12,7 @@ const GoosDarwin = 0 const GoosDragonfly = 0 const GoosFreebsd = 0 const GoosHurd = 0 +const GoosIllumos = 0 const GoosJs = 1 const GoosLinux = 0 const GoosNacl = 0 diff --git a/src/runtime/internal/sys/zgoos_linux.go b/src/runtime/internal/sys/zgoos_linux.go index 088dbc105b..1d5fcb0685 100644 --- a/src/runtime/internal/sys/zgoos_linux.go +++ b/src/runtime/internal/sys/zgoos_linux.go @@ -13,6 +13,7 @@ const GoosDarwin = 0 const GoosDragonfly = 0 const GoosFreebsd = 0 const GoosHurd = 0 +const GoosIllumos = 0 const GoosJs = 0 const GoosLinux = 1 const GoosNacl = 0 diff --git a/src/runtime/internal/sys/zgoos_nacl.go b/src/runtime/internal/sys/zgoos_nacl.go index 65bec4af9e..9e65b6f185 100644 --- a/src/runtime/internal/sys/zgoos_nacl.go +++ b/src/runtime/internal/sys/zgoos_nacl.go @@ -12,6 +12,7 @@ const GoosDarwin = 0 const GoosDragonfly = 0 const GoosFreebsd = 0 const GoosHurd = 0 +const GoosIllumos = 0 const GoosJs = 0 const GoosLinux = 0 const GoosNacl = 1 diff --git a/src/runtime/internal/sys/zgoos_netbsd.go b/src/runtime/internal/sys/zgoos_netbsd.go index 93d0fa7e11..194fa6e432 100644 --- a/src/runtime/internal/sys/zgoos_netbsd.go +++ b/src/runtime/internal/sys/zgoos_netbsd.go @@ -12,6 +12,7 @@ const GoosDarwin = 0 const GoosDragonfly = 0 const GoosFreebsd = 0 const GoosHurd = 0 +const GoosIllumos = 0 const GoosJs = 0 const GoosLinux = 0 const GoosNacl = 0 diff --git a/src/runtime/internal/sys/zgoos_openbsd.go b/src/runtime/internal/sys/zgoos_openbsd.go index 79193593f5..2108691679 100644 --- a/src/runtime/internal/sys/zgoos_openbsd.go +++ b/src/runtime/internal/sys/zgoos_openbsd.go @@ -12,6 +12,7 @@ const GoosDarwin = 0 const GoosDragonfly = 0 const GoosFreebsd = 0 const GoosHurd = 0 +const GoosIllumos = 0 const GoosJs = 0 const GoosLinux = 0 const GoosNacl = 0 diff --git a/src/runtime/internal/sys/zgoos_plan9.go b/src/runtime/internal/sys/zgoos_plan9.go index 2b95e08080..e632a90b2e 100644 --- a/src/runtime/internal/sys/zgoos_plan9.go +++ b/src/runtime/internal/sys/zgoos_plan9.go @@ -12,6 +12,7 @@ const GoosDarwin = 0 const GoosDragonfly = 0 const GoosFreebsd = 0 const GoosHurd = 0 +const GoosIllumos = 0 const GoosJs = 0 const GoosLinux = 0 const GoosNacl = 0 diff --git a/src/runtime/internal/sys/zgoos_solaris.go b/src/runtime/internal/sys/zgoos_solaris.go index 6e3988aed0..67b2ffbfcd 100644 --- a/src/runtime/internal/sys/zgoos_solaris.go +++ b/src/runtime/internal/sys/zgoos_solaris.go @@ -1,5 +1,6 @@ // Code generated by gengoos.go using 'go generate'. DO NOT EDIT. +// +build !illumos // +build solaris package sys @@ -12,6 +13,7 @@ const GoosDarwin = 0 const GoosDragonfly = 0 const GoosFreebsd = 0 const GoosHurd = 0 +const GoosIllumos = 0 const GoosJs = 0 const GoosLinux = 0 const GoosNacl = 0 diff --git a/src/runtime/internal/sys/zgoos_windows.go b/src/runtime/internal/sys/zgoos_windows.go index a56e12544a..cf2d6f4fb0 100644 --- a/src/runtime/internal/sys/zgoos_windows.go +++ b/src/runtime/internal/sys/zgoos_windows.go @@ -12,6 +12,7 @@ const GoosDarwin = 0 const GoosDragonfly = 0 const GoosFreebsd = 0 const GoosHurd = 0 +const GoosIllumos = 0 const GoosJs = 0 const GoosLinux = 0 const GoosNacl = 0 diff --git a/src/runtime/internal/sys/zgoos_zos.go b/src/runtime/internal/sys/zgoos_zos.go index 0f56e46002..e5d79accb4 100644 --- a/src/runtime/internal/sys/zgoos_zos.go +++ b/src/runtime/internal/sys/zgoos_zos.go @@ -12,6 +12,7 @@ const GoosDarwin = 0 const GoosDragonfly = 0 const GoosFreebsd = 0 const GoosHurd = 0 +const GoosIllumos = 0 const GoosJs = 0 const GoosLinux = 0 const GoosNacl = 0 |
