Skip to content

Commit

Permalink
Auto merge of rust-lang#121564 - ojeda:rustc-jobserver, r=ehuss
Browse files Browse the repository at this point in the history
rustc: document the jobserver

Explicitly document that the jobserver may be used by `rustc`, as well as recommend the `+` indicator for integration of `rustc` into GNU Make.

In particular, show the warning to increase the chances that this document is found when searching for solutions online.

In addition, add a note about the issue with GNU Make 4.3 since it is important that users realize they should do this even if they do not expect parallelism from `rustc`.

Finally, show how to workaround the issue of `$(shell ...)` calls in recursive Make (which e.g. was needed for the Linux kernel).

The GNU Make 4.4 case under `--jobserver-style=pipe` is not added since it got fixed after Rust 1.76.0 already (i.e. `rustc` will not warn if it finds the negative file descriptors).

From: rust-lang#120515
Cc: `@petrochenkov` `@belovdv` `@weihanglo` `@bjorn3`

---

v2: To be able to use tab characters for the Make examples, add `<!-- ignore-tidy-{check} -->` support to `tidy`.
v3: Added "Integration with build systems" section to hold the GNU Make one. Added "by clearing the `MAKEFLAGS` variable". Added "aforementioned" so that it is clear we are talking about the warning above.
v4: Added CMake subsection. Added a note that `rustc` may be affected by other flags, e.g. `CARGO_MAKEFLAGS`.
v5: Added that `rustc` will choose the number of jobs if a jobserver is not passed.
  • Loading branch information
bors committed May 1, 2024
2 parents be9bca2 + 7e4955e commit c987ad5
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/doc/rustc/src/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
- [What is rustc?](what-is-rustc.md)
- [Command-line Arguments](command-line-arguments.md)
- [Codegen Options](codegen-options/index.md)
- [Jobserver](jobserver.md)
- [Lints](lints/index.md)
- [Lint Levels](lints/levels.md)
- [Lint Groups](lints/groups.md)
Expand Down
86 changes: 86 additions & 0 deletions src/doc/rustc/src/jobserver.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
# Jobserver

Internally, `rustc` may take advantage of parallelism. `rustc` will coordinate
with the build system calling it if a [GNU Make jobserver] is passed in the
`MAKEFLAGS` environment variable. Other flags may have an effect as well, such
as [`CARGO_MAKEFLAGS`]. If a jobserver is not passed, then `rustc` will choose
the number of jobs to use.

Starting with Rust 1.76.0, `rustc` will warn if a jobserver appears to be
available but is not accessible, e.g.:

```console
$ echo 'fn main() {}' | MAKEFLAGS=--jobserver-auth=3,4 rustc -
warning: failed to connect to jobserver from environment variable `MAKEFLAGS="--jobserver-auth=3,4"`: cannot open file descriptor 3 from the jobserver environment variable value: Bad file descriptor (os error 9)
|
= note: the build environment is likely misconfigured
```

## Integration with build systems

The following subsections contain recommendations on how to integrate `rustc`
with build systems so that the jobserver is handled appropriately.

### GNU Make

When calling `rustc` from GNU Make, it is recommended that all `rustc`
invocations are marked as recursive in the `Makefile` (by prefixing the command
line with the `+` indicator), so that GNU Make enables the jobserver for them.
For instance:

<!-- ignore-tidy-tab -->

```make
x:
+@echo 'fn main() {}' | rustc -
```

In particular, GNU Make 4.3 (a widely used version as of 2024) passes a simple
pipe jobserver in `MAKEFLAGS` even when it was not made available for the child
process, which in turn means `rustc` will warn about it. For instance, if the
`+` indicator is removed from the example above and GNU Make is called with e.g.
`make -j2`, then the aforementioned warning will trigger.

For calls to `rustc` inside `$(shell ...)` inside a recursive Make, one can
disable the jobserver manually by clearing the `MAKEFLAGS` variable, e.g.:

```make
S := $(shell MAKEFLAGS= rustc --print sysroot)

x:
@$(MAKE) y

y:
@echo $(S)
```

### CMake

CMake 3.28 supports the `JOB_SERVER_AWARE` option in its [`add_custom_target`]
command, e.g.:

```cmake
cmake_minimum_required(VERSION 3.28)
project(x)
add_custom_target(x
JOB_SERVER_AWARE TRUE
COMMAND echo 'fn main() {}' | rustc -
)
```

For earlier versions, when using CMake with the Makefile generator, one
workaround is to have [`$(MAKE)`] somewhere in the command so that GNU Make
treats it as a recursive Make call, e.g.:

```cmake
cmake_minimum_required(VERSION 3.22)
project(x)
add_custom_target(x
COMMAND DUMMY_VARIABLE=$(MAKE) echo 'fn main() {}' | rustc -
)
```

[GNU Make jobserver]: https://www.gnu.org/software/make/manual/html_node/POSIX-Jobserver.html
[`CARGO_MAKEFLAGS`]: https://doc.rust-lang.org/cargo/reference/environment-variables.html
[`add_custom_target`]: https://cmake.org/cmake/help/latest/command/add_custom_target.html
[`$(MAKE)`]: https://www.gnu.org/software/make/manual/html_node/MAKE-Variable.html
4 changes: 3 additions & 1 deletion src/tools/tidy/src/style.rs
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ fn contains_ignore_directive(can_contain: bool, contents: &str, check: &str) ->
if contents.contains(&format!("// ignore-tidy-{check}"))
|| contents.contains(&format!("# ignore-tidy-{check}"))
|| contents.contains(&format!("/* ignore-tidy-{check} */"))
|| contents.contains(&format!("<!-- ignore-tidy-{check} -->"))
{
Directive::Ignore(false)
} else {
Expand Down Expand Up @@ -346,7 +347,8 @@ pub fn check(path: &Path, bad: &mut bool) {

let can_contain = contents.contains("// ignore-tidy-")
|| contents.contains("# ignore-tidy-")
|| contents.contains("/* ignore-tidy-");
|| contents.contains("/* ignore-tidy-")
|| contents.contains("<!-- ignore-tidy-");
// Enable testing ICE's that require specific (untidy)
// file formats easily eg. `issue-1234-ignore-tidy.rs`
if filename.contains("ignore-tidy") {
Expand Down

0 comments on commit c987ad5

Please sign in to comment.