diff options
| author | bors <bors@rust-lang.org> | 2021-05-06 07:02:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-05-06 07:02:06 +0000 |
| commit | 1d99508b52499c9efd213738e71927458c1d394e (patch) | |
| tree | c6038c10d28b76b941cb339b8491f5e9c273b757 | |
| parent | d620ae10709ca3669cda89db8b29afcd9accc188 (diff) | |
| parent | fe68b1ab327297fea9ed2fb273fe0a7ac5aedfdd (diff) | |
| download | rust-1d99508b52499c9efd213738e71927458c1d394e.tar.gz rust-1d99508b52499c9efd213738e71927458c1d394e.zip | |
Auto merge of #84468 - iladin:iladin/fix-84467, r=petrochenkov
Fix#84467 linker_args with --target=sparcv9-sun-solaris Trying to cross-compile for sparcv9-sun-solaris getting a error message for -zignore Introduced when -z -ignore was seperated here 22d0ab0 No formatting done Reproduce ``` bash rustup target add sparcv9-sun-solaris cargo new --bin hello && cd hello && cargo run --target=sparcv9-sun-solaris ``` config.toml [target.sparcv9-sun-solaris] linker = "gcc"
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/linker.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs index 77d8ab49ff2..8ba124a1fa8 100644 --- a/compiler/rustc_codegen_ssa/src/back/linker.rs +++ b/compiler/rustc_codegen_ssa/src/back/linker.rs @@ -432,8 +432,6 @@ impl<'a> Linker for GccLinker<'a> { // insert it here. if self.sess.target.is_like_osx { self.linker_arg("-dead_strip"); - } else if self.sess.target.is_like_solaris { - self.linker_arg("-zignore"); // If we're building a dylib, we don't use --gc-sections because LLVM // has already done the best it can do, and we also don't want to @@ -655,6 +653,10 @@ impl<'a> Linker for GccLinker<'a> { fn add_as_needed(&mut self) { if self.sess.target.linker_is_gnu { self.linker_arg("--as-needed"); + } else if self.sess.target.is_like_solaris { + // -z ignore is the Solaris equivalent to the GNU ld --as-needed option + self.linker_arg("-z"); + self.linker_arg("ignore"); } } } |
