diff options
| author | bors <bors@rust-lang.org> | 2022-11-16 15:55:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-16 15:55:30 +0000 |
| commit | e69336efe035c274f2ee66922cd9cac6015956ea (patch) | |
| tree | 75586b5b6990744696a789341a292c14f7ddcc78 /src/doc | |
| parent | 63c748ee23ab7b6706655146f5b7c7f579811803 (diff) | |
| parent | 972ad00094d8405b1188e5a40c1378f2eb073223 (diff) | |
| download | rust-e69336efe035c274f2ee66922cd9cac6015956ea.tar.gz rust-e69336efe035c274f2ee66922cd9cac6015956ea.zip | |
Auto merge of #104492 - matthiaskrgr:rollup-3xyjynz, r=matthiaskrgr
Rollup of 8 pull requests
Successful merges:
- #103750 (Fix some misleading target feature aliases)
- #104137 (Issue error when -C link-self-contained option is used on unsupported platforms)
- #104317 (cleanup and dedupe CTFE and Miri error reporting)
- #104335 (Only do parser recovery on retried macro matching)
- #104394 (various cleanups to try to reduce the use of spans inside method resolution)
- #104459 (rustdoc: remove unused JS IIFE from main.js)
- #104462 (rustdoc: remove pointless CSS `.rightside { padding-right: 2px }`)
- #104466 (rustdoc: remove no-op CSS `#crate-search-div { display: inline-block }`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/rustc/src/codegen-options/index.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/rustc/src/codegen-options/index.md b/src/doc/rustc/src/codegen-options/index.md index f5a49410ea5..7e355b7fccf 100644 --- a/src/doc/rustc/src/codegen-options/index.md +++ b/src/doc/rustc/src/codegen-options/index.md @@ -210,8 +210,8 @@ metrics. ## link-self-contained -On targets that support it this flag controls whether the linker will use libraries and objects -shipped with Rust instead or those in the system. +On `windows-gnu`, `linux-musl`, and `wasi` targets, this flag controls whether the +linker will use libraries and objects shipped with Rust instead or those in the system. It takes one of the following values: * no value: rustc will use heuristic to disable self-contained mode if system has necessary tools. |
