Skip to content

Commit

Permalink
Auto merge of #3955 - RReverser:update-override-docs, r=alexcrichton
Browse files Browse the repository at this point in the history
Update documentation on overrides

 - `target.linker` does not seem to be supported anymore, only `target.$triple.linker` works, so merged these sections.
 - Added note about supported `target.$triple.ar`
  • Loading branch information
bors committed Apr 26, 2017
2 parents 0f27ca3 + 841fd82 commit 80e653b
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions src/doc/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,15 @@ email = "..."
vcs = "none"

# For the following sections, $triple refers to any valid target triple, not the
# literal string "$triple", and it will apply whenever that target triple is
# being compiled to. 'cfg(...)' refers to the Rust-like `#[cfg]` syntax for
# literal string "$triple", and it will apply whenever that target triple is
# being compiled to. 'cfg(...)' refers to the Rust-like `#[cfg]` syntax for
# conditional compilation.
[target]
# For Cargo builds which do not mention --target, this is the linker
# which is passed to rustc (via `-C linker=`). By default this flag is not
# passed to the compiler.
linker = ".."

[target.$triple]
# Similar to the above linker configuration, but this only applies to
# when the `$triple` is being compiled for.
linker = ".."
[target.$triple]
# This is the linker which is passed to rustc (via `-C linker=`) when the `$triple`
# is being compiled for. By default this flag is not passed to the compiler.
linker = ".."
# Same but for the library archiver which is passed to rustc via `-C ar=`.
ar = ".."
# custom flags to pass to all compiler invocations that target $triple
# this value overrides build.rustflags when both are present
rustflags = ["..", ".."]
Expand Down

0 comments on commit 80e653b

Please sign in to comment.