Skip to content

Commit 80e653b

Browse files
committed
Auto merge of #3955 - RReverser:update-override-docs, r=alexcrichton
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`
2 parents 0f27ca3 + 841fd82 commit 80e653b

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

src/doc/config.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,15 @@ email = "..."
5757
vcs = "none"
5858

5959
# For the following sections, $triple refers to any valid target triple, not the
60-
# literal string "$triple", and it will apply whenever that target triple is
61-
# being compiled to. 'cfg(...)' refers to the Rust-like `#[cfg]` syntax for
60+
# literal string "$triple", and it will apply whenever that target triple is
61+
# being compiled to. 'cfg(...)' refers to the Rust-like `#[cfg]` syntax for
6262
# conditional compilation.
63-
[target]
64-
# For Cargo builds which do not mention --target, this is the linker
65-
# which is passed to rustc (via `-C linker=`). By default this flag is not
66-
# passed to the compiler.
67-
linker = ".."
68-
69-
[target.$triple]
70-
# Similar to the above linker configuration, but this only applies to
71-
# when the `$triple` is being compiled for.
72-
linker = ".."
63+
[target.$triple]
64+
# This is the linker which is passed to rustc (via `-C linker=`) when the `$triple`
65+
# is being compiled for. By default this flag is not passed to the compiler.
66+
linker = ".."
67+
# Same but for the library archiver which is passed to rustc via `-C ar=`.
68+
ar = ".."
7369
# custom flags to pass to all compiler invocations that target $triple
7470
# this value overrides build.rustflags when both are present
7571
rustflags = ["..", ".."]

0 commit comments

Comments
 (0)