Skip to content

Commit da86710

Browse files
committed
Rename default linker linux field
1 parent b07d88f commit da86710

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/bootstrap/src/core/config/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ impl Config {
844844
ar: target_ar,
845845
ranlib: target_ranlib,
846846
default_linker: target_default_linker,
847-
default_linker_linux: target_default_linker_linux_override,
847+
default_linker_linux_override: target_default_linker_linux_override,
848848
linker: target_linker,
849849
split_debuginfo: target_split_debuginfo,
850850
llvm_config: target_llvm_config,

src/bootstrap/src/core/config/toml/target.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ define_config! {
2727
ar: Option<String> = "ar",
2828
ranlib: Option<String> = "ranlib",
2929
default_linker: Option<PathBuf> = "default-linker",
30-
default_linker_linux: Option<DefaultLinuxLinkerOverride> = "default-linker-linux-override",
30+
default_linker_linux_override: Option<DefaultLinuxLinkerOverride> = "default-linker-linux-override",
3131
linker: Option<String> = "linker",
3232
split_debuginfo: Option<String> = "split-debuginfo",
3333
llvm_config: Option<String> = "llvm-config",
@@ -95,7 +95,7 @@ impl Target {
9595
}
9696
}
9797

98-
/// Overrides the default linker used on a Linux linker.
98+
/// Overrides the default linker used on a Linux target.
9999
/// On Linux, the linker is usually invoked through `cc`, therefore this exists as a separate
100100
/// configuration from simply setting `default-linker`, which corresponds to `-Clinker`.
101101
#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)]

0 commit comments

Comments
 (0)