bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Undo unnecessary changes.

Browse source
This commit is contained in:
Luqman Aden 2021-05-18 02:42:29 -07:00
parent a862b1f6cc
commit e0d5872503
1 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compiler/rustc_codegen_ssa/src/back/linker.rs
View file

@ -276,27 +276,18 @@ 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.linker_is_gnu {
&& self.sess.target.linker_is_gnu
&& !self.sess.target.is_like_windows
{
self.cmd.arg("-no-pie"); self.cmd.arg("-no-pie");
} }
} }
LinkOutputKind::DynamicPicExe => { LinkOutputKind::DynamicPicExe => {
// noop on windows w/ gcc & ld, error w/ lld // `-pie` works for both gcc wrapper and ld.
if !self.sess.target.is_like_windows { self.cmd.arg("-pie");
// `-pie` works for both gcc wrapper and ld
self.cmd.arg("-pie");
}
} }
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.linker_is_gnu {
&& self.sess.target.linker_is_gnu
&& !self.sess.target.is_like_windows
{
self.cmd.arg("-no-pie"); self.cmd.arg("-no-pie");
} }
} }