diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2020-09-27 01:53:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 01:53:23 +0200 |
| commit | 3d1d24da9402459d44dbd7c088885de9d78699a7 (patch) | |
| tree | 2db86be5c0d84c48bef242ca56aa51401773cac8 /compiler/rustc_codegen_ssa/src | |
| parent | bb416f3a59ae5d5e4178a29ec351b579d9e36321 (diff) | |
| parent | bfdb7903c924127e90afe8838410feb660ec4811 (diff) | |
| download | rust-3d1d24da9402459d44dbd7c088885de9d78699a7.tar.gz rust-3d1d24da9402459d44dbd7c088885de9d78699a7.zip | |
Rollup merge of #77208 - mati865:late-link-args-order, r=petrochenkov
Late link args order
MSYS2 changed how winpthreads is built and as the result it now depends on more mingw-w64 libraries.
This PR affects only MinGW targets since nobody else is using `late_link_args_{dynamic,static}`. Now the order is similar to how it used to be before https://github.com/rust-lang/rust/pull/67502.
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index faeb727202c..87d539f748c 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -1333,9 +1333,6 @@ fn add_late_link_args( crate_type: CrateType, codegen_results: &CodegenResults, ) { - if let Some(args) = sess.target.target.options.late_link_args.get(&flavor) { - cmd.args(args); - } let any_dynamic_crate = crate_type == CrateType::Dylib || codegen_results.crate_info.dependency_formats.iter().any(|(ty, list)| { *ty == crate_type && list.iter().any(|&linkage| linkage == Linkage::Dynamic) @@ -1349,6 +1346,9 @@ fn add_late_link_args( cmd.args(args); } } + if let Some(args) = sess.target.target.options.late_link_args.get(&flavor) { + cmd.args(args); + } } /// Add arbitrary "post-link" args defined by the target spec. |
