Skip to content

Commit

Permalink
Auto merge of #14165 - madsmtm:target_family, r=epage
Browse files Browse the repository at this point in the history
Make it clear that `CARGO_CFG_TARGET_FAMILY` is multi-valued

`target_family` / `CARGO_CFG_TARGET_FAMILY` can take multiple values, but this is not particularly clear in the documentation. To resolve this, I've changed the example to document this.

[A crater run](rust-lang/rust#124355 (comment)) found a few instances where this value was incorrectly assumed to be a single value.
  • Loading branch information
bors committed Jun 28, 2024
2 parents cc1e355 + 2dc544e commit 1b4aafb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/doc/src/reference/environment-variables.md
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ let out_dir = env::var("OUT_DIR").unwrap();
those defined in `RUSTFLAGS`). Some examples of what these variables are:
* `CARGO_CFG_UNIX` --- Set on [unix-like platforms].
* `CARGO_CFG_WINDOWS` --- Set on [windows-like platforms].
* `CARGO_CFG_TARGET_FAMILY=unix` --- The [target family].
* `CARGO_CFG_TARGET_FAMILY=unix,wasm` --- The [target family].
* `CARGO_CFG_TARGET_OS=macos` --- The [target operating system].
* `CARGO_CFG_TARGET_ARCH=x86_64` --- The CPU [target architecture].
* `CARGO_CFG_TARGET_VENDOR=apple` --- The [target vendor].
Expand Down

0 comments on commit 1b4aafb

Please sign in to comment.