From 841fd82114ff041e41b0315474602c340df9961c Mon Sep 17 00:00:00 2001 From: Ingvar Stepanyan Date: Wed, 26 Apr 2017 01:32:07 +0100 Subject: [PATCH] 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 --- src/doc/config.md | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/doc/config.md b/src/doc/config.md index 1b3ae50c6c2..382b5c14529 100644 --- a/src/doc/config.md +++ b/src/doc/config.md @@ -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 = ["..", ".."]