diff options
| author | bors <bors@rust-lang.org> | 2020-03-17 18:27:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-17 18:27:26 +0000 |
| commit | 7ceebd98c6a15ae30e772eebb676b63ffa1a8122 (patch) | |
| tree | 4c762975c0da155553eb6e677b0b033fe37a8664 /src/librustc_codegen_utils | |
| parent | 660326e9791d5caf3186b14521498c2584a494ab (diff) | |
| parent | afd374ff3608570cdbc8889a52299d52ee52c7e2 (diff) | |
| download | rust-7ceebd98c6a15ae30e772eebb676b63ffa1a8122.tar.gz rust-7ceebd98c6a15ae30e772eebb676b63ffa1a8122.zip | |
Auto merge of #69519 - 12101111:remove-proc-macro-check, r=nagisa
Don't use static crt by default when build proc-macro Don't check value of `crt-static` when build proc-macro crates, since they are always built dynamically. For more information, see https://github.com/rust-lang/cargo/issues/7563#issuecomment-591965320 I hope this will fix issues about compiling `proc_macro` crates on musl host without bring more issues. Fix https://github.com/rust-lang/cargo/issues/7563
Diffstat (limited to 'src/librustc_codegen_utils')
| -rw-r--r-- | src/librustc_codegen_utils/link.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/librustc_codegen_utils/link.rs b/src/librustc_codegen_utils/link.rs index 524fb0a59c2..2850a29148e 100644 --- a/src/librustc_codegen_utils/link.rs +++ b/src/librustc_codegen_utils/link.rs @@ -167,7 +167,9 @@ pub fn invalid_output_for_target(sess: &Session, crate_type: config::CrateType) if !sess.target.target.options.dynamic_linking { return true; } - if sess.crt_static() && !sess.target.target.options.crt_static_allows_dylibs { + if sess.crt_static(Some(crate_type)) + && !sess.target.target.options.crt_static_allows_dylibs + { return true; } } |