Skip to content

Commit

Permalink
Rollup merge of rust-lang#100074 - petrochenkov:bundledoc, r=bjorn3
Browse files Browse the repository at this point in the history
rustc-docs: Be less specific about the representation of `+bundle`

For rust-lang#99429.
r? `@bjorn3`
  • Loading branch information
matthiaskrgr authored Aug 2, 2022
2 parents 7a6f461 + 2bbdc41 commit e20f7f8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/doc/rustc/src/command-line-arguments.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ but it is not guaranteed. If you need whole archive semantics use `+whole-archiv
This modifier is only compatible with the `static` linking kind.
Using any other kind will result in a compiler error.

When building a rlib or staticlib `+bundle` means that all object files from the native static
library will be added to the rlib or staticlib archive, and then used from it during linking of
the final binary.
When building a rlib or staticlib `+bundle` means that the native static library
will be packed into the rlib or staticlib archive, and then retrieved from there
during linking of the final binary.

When building a rlib `-bundle` means that the native static library is registered as a dependency
of that rlib "by name", and object files from it are included only during linking of the final
Expand Down

0 comments on commit e20f7f8

Please sign in to comment.