diff options
| author | bors <bors@rust-lang.org> | 2018-12-14 00:28:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-14 00:28:08 +0000 |
| commit | 0d4f91905bf3071354e30c85f931d11bf2c0009a (patch) | |
| tree | 0c46b78f74429a9485f7592ddf883044a1b773fa /src/librustc_codegen_ssa | |
| parent | 5900dae51d16c0b4d220f526fea632011f39658b (diff) | |
| parent | 9536d04a2d1af8163a0ec772ec747a0e98a8e4db (diff) | |
| download | rust-0d4f91905bf3071354e30c85f931d11bf2c0009a.tar.gz rust-0d4f91905bf3071354e30c85f931d11bf2c0009a.zip | |
Auto merge of #56351 - davidtwco:issue-55396-stabilize-linker-flavor, r=nagisa
Stabilize `linker-flavor` flag. Part of #55396. This commit moves the linker-flavor flag from a debugging option to a codegen option, thus stabilizing it. There are no feature flags associated with this flag. r? @nagisa
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/back/link.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs index 24a70dc7977..59102e09d4c 100644 --- a/src/librustc_codegen_ssa/back/link.rs +++ b/src/librustc_codegen_ssa/back/link.rs @@ -192,11 +192,7 @@ pub fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) { // linker and linker flavor specified via command line have precedence over what the target // specification specifies - if let Some(ret) = infer_from( - sess, - sess.opts.cg.linker.clone(), - sess.opts.debugging_opts.linker_flavor, - ) { + if let Some(ret) = infer_from(sess, sess.opts.cg.linker.clone(), sess.opts.cg.linker_flavor) { return ret; } |
