diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2022-12-20 15:02:03 -0800 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2022-12-20 15:02:03 -0800 |
| commit | 1644d755d0b06d0f1ee93e1c44336c29386546b4 (patch) | |
| tree | 58f4fb795fed3f4b2c1cb6bbac9ed25b3134d390 /scripts/jobserver-exec | |
| parent | b29e6ece454f7f4822b40441da393c3969c312b3 (diff) | |
| parent | b6bb9676f2165d518b35ba3bea5f1fcfc0d969bf (diff) | |
| download | net-1644d755d0b06d0f1ee93e1c44336c29386546b4.tar.gz | |
Merge branch 'linus'
Diffstat (limited to 'scripts/jobserver-exec')
| -rwxr-xr-x | scripts/jobserver-exec | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/jobserver-exec b/scripts/jobserver-exec index 8762887a970ce2..4192855f5b8b5c 100755 --- a/scripts/jobserver-exec +++ b/scripts/jobserver-exec @@ -23,7 +23,9 @@ try: opts = [x for x in flags.split(" ") if x.startswith("--jobserver")] # Parse out R,W file descriptor numbers and set them nonblocking. - fds = opts[0].split("=", 1)[1] + # If the MAKEFLAGS variable contains multiple instances of the + # --jobserver-auth= option, the last one is relevant. + fds = opts[-1].split("=", 1)[1] reader, writer = [int(x) for x in fds.split(",", 1)] # Open a private copy of reader to avoid setting nonblocking # on an unexpecting process with the same reader fd. |