diff options
author | Nicolas Lacasse <nlacasse@google.com> | 2019-06-25 11:46:19 -0700 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2019-06-25 11:47:27 -0700 |
commit | a8f148b8e4098eaeb80e1d704b64aab8aeb1294f (patch) | |
tree | 84e3b913a2c2be598eb89d1a666bacb83abbca11 /runsc/console/BUILD | |
parent | 03ae91c662869a37ba71dd2577d4e218a3aa4669 (diff) |
Use different Ctty FDs based on the go version.
An upcoming change in Go 1.13 [1] changes the semantics of the SysProcAttr.Ctty
field. Prior to the change, the FD must be an FD in the child process's FD
table (aka "post-shuffle"). After the change, the FD must be an FD in the
current process's FD table (aka "pre-shuffle").
To be compatible with both versions this CL introduces a new boolean
"CttyFdIsPostShuffle" which indicates whether a pre- or post-shuffle FD should
be provided. We use build tags to chose the correct one.
1: https://go-review.googlesource.com/c/go/+/178919/
PiperOrigin-RevId: 255015303
Diffstat (limited to 'runsc/console/BUILD')
-rw-r--r-- | runsc/console/BUILD | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runsc/console/BUILD b/runsc/console/BUILD index 2d71cd371..b7d8f32ca 100644 --- a/runsc/console/BUILD +++ b/runsc/console/BUILD @@ -4,7 +4,11 @@ package(licenses = ["notice"]) go_library( name = "console", - srcs = ["console.go"], + srcs = [ + "console.go", + "ctty_1_12.go", + "ctty_1_13.go", + ], importpath = "gvisor.dev/gvisor/runsc/console", visibility = [ "//runsc:__subpackages__", |