bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #73384 - petrochenkov:gnulink, r=cuviper

Browse source 
linker: Never pass `-no-pie` to non-gnu linkers

Fixes https://github.com/rust-lang/rust/issues/73370
This commit is contained in:
bors 2020-06-18 04:29:23 +00:00
commit e55d3f9c52
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_codegen_ssa/back/linker.rs
View file

@ -280,7 +280,7 @@ impl<'a> Linker for GccLinker<'a> {
fn set_output_kind(&mut self, output_kind: LinkOutputKind, out_filename: &Path) { fn set_output_kind(&mut self, output_kind: LinkOutputKind, out_filename: &Path) {
match output_kind { match output_kind {
LinkOutputKind::DynamicNoPicExe => { LinkOutputKind::DynamicNoPicExe => {
if !self.is_ld { if !self.is_ld && self.sess.target.target.options.linker_is_gnu {
self.cmd.arg("-no-pie"); self.cmd.arg("-no-pie");
} }
} }
@ -291,7 +291,7 @@ impl<'a> Linker for GccLinker<'a> {
LinkOutputKind::StaticNoPicExe => { LinkOutputKind::StaticNoPicExe => {
// `-static` works for both gcc wrapper and ld. // `-static` works for both gcc wrapper and ld.
self.cmd.arg("-static"); self.cmd.arg("-static");
if !self.is_ld { if !self.is_ld && self.sess.target.target.options.linker_is_gnu {
self.cmd.arg("-no-pie"); self.cmd.arg("-no-pie");
} }
} }