bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix linker on Solaris/Illumos

Browse source 
Solaris linker doesn't support the `--retain-symbols-file` option,
so this patch provides version scripts as an alternative on that
platform.
This commit is contained in:
Nikita Baksalyar 2016-08-13 14:09:43 +05:00
parent 413ada3040
commit c08b7b9f75
No known key found for this signature in database
GPG key ID: 3EEA378A0EA758DA
1 changed files with 40 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/librustc_trans/back/linker.rs
View file

@ -247,29 +247,49 @@ impl<'a> Linker for GnuLinker<'a> {
return
}
let path = tmpdir.join("list");
let prefix = if self.sess.target.target.options.is_like_osx {
"_"
} else {
""
};
let res = (|| -> io::Result<()> {
let mut f = BufWriter::new(File::create(&path)?);
for sym in &self.info.cdylib_exports {
writeln!(f, "{}{}", prefix, sym)?;
}
Ok(())
})();
if let Err(e) = res {
self.sess.fatal(&format!("failed to write lib.def file: {}", e));
}
let mut arg = OsString::new();
if self.sess.target.target.options.is_like_osx {
arg.push("-Wl,-exported_symbols_list,");
let path = tmpdir.join("list");
if self.sess.target.target.options.is_like_solaris {
let res = (|| -> io::Result<()> {
let mut f = BufWriter::new(File::create(&path)?);
writeln!(f, "{{\n global:")?;
for sym in &self.info.cdylib_exports {
writeln!(f, " {};", sym)?;
}
writeln!(f, "\n local:\n *;\n}};")?;
Ok(())
})();
if let Err(e) = res {
self.sess.fatal(&format!("failed to write version script: {}", e));
}
arg.push("-Wl,-M,");
arg.push(&path);
} else {
arg.push("-Wl,--retain-symbols-file=");
let prefix = if self.sess.target.target.options.is_like_osx {
"_"
} else {
""
};
let res = (|| -> io::Result<()> {
let mut f = BufWriter::new(File::create(&path)?);
for sym in &self.info.cdylib_exports {
writeln!(f, "{}{}", prefix, sym)?;
}
Ok(())
})();
if let Err(e) = res {
self.sess.fatal(&format!("failed to write lib.def file: {}", e));
}
if self.sess.target.target.options.is_like_osx {
arg.push("-Wl,-exported_symbols_list,");
} else {
arg.push("-Wl,--retain-symbols-file=");
}
arg.push(&path);
}
arg.push(&path);
self.cmd.arg(arg);
}
}