Skip to content

Commit 14e11c8

Browse files
authored
Rollup merge of #113725 - mati865:config-move-mingw-option-to-dist, r=Mark-Simulacrum
Move MinGW linker dist option to proper section Using this option currently results in the error: ``` failed to parse TOML configuration 'config.toml': unknown field `include-mingw-linker`, expected one of `optimize`, `debug`, `codegen-units`, `codegen-units-std`, `debug-assertions`, `debug-assertions-std`, `overflow-checks`, `overflow-checks-std`, `debug-logging`, `debuginfo-level`, `debuginfo-level-rustc`, `debuginfo-level-std`, `debuginfo-level-tools`, `debuginfo-level-tests`, `split-debuginfo`, `run-dsymutil`, `backtrace`, `incremental`, `parallel-compiler`, `default-linker`, `channel`, `description`, `musl-root`, `rpath`, `verbose-tests`, `optimize-tests`, `codegen-tests`, `omit-git-hash`, `dist-src`, `save-toolstates`, `codegen-backends`, `lld`, `use-lld`, `llvm-tools`, `deny-warnings`, `backtrace-on-ice`, `verify-llvm-ir`, `thin-lto-import-instr-limit`, `remap-debuginfo`, `jemalloc`, `test-compare-mode`, `llvm-libunwind`, `control-flow-guard`, `new-symbol-mangling`, `profile-generate`, `profile-use`, `download-rustc`, `lto`, `validate-mir-opts` for key `rust` ``` That's because the option [belongs to `dist` section](https://github.com/rust-lang/rust/blob/bef6ff618f17398775e9d8cd23a6f47d983869dc/src/bootstrap/config.rs#L861). cc #108581
2 parents 58f963f + cf4fcf8 commit 14e11c8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Diff for: config.example.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -690,10 +690,6 @@ changelog-seen = 2
690690
# Build compiler with the optimization enabled and -Zvalidate-mir, currently only for `std`
691691
#validate-mir-opts = 3
692692

693-
# Copy the linker, DLLs, and various libraries from MinGW into the rustc toolchain.
694-
# Only applies when the host or target is pc-windows-gnu.
695-
#include-mingw-linker = true
696-
697693
# =============================================================================
698694
# Options for specific targets
699695
#
@@ -844,3 +840,7 @@ changelog-seen = 2
844840
#
845841
# Available options: fast, balanced, best
846842
#compression-profile = "fast"
843+
844+
# Copy the linker, DLLs, and various libraries from MinGW into the rustc toolchain.
845+
# Only applies when the host or target is pc-windows-gnu.
846+
#include-mingw-linker = true

0 commit comments

Comments
 (0)