bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove ArchiveConfig

Browse source
This commit is contained in:
bjorn3 2020-08-08 16:19:42 +02:00
parent fb0e5c6211
commit 8664ccc27f
1 changed files with 23 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/archive.rs
View file

@ -8,14 +8,6 @@ use rustc_codegen_ssa::METADATA_FILENAME;
use object::{Object, SymbolKind}; use object::{Object, SymbolKind};
struct ArchiveConfig<'a> {
sess: &'a Session,
dst: PathBuf,
lib_search_paths: Vec<PathBuf>,
use_gnu_style_archive: bool,
no_builtin_ranlib: bool,
}
#[derive(Debug)] #[derive(Debug)]
enum ArchiveEntry { enum ArchiveEntry {
FromArchive { FromArchive {
@ -26,7 +18,12 @@ enum ArchiveEntry {
} }
pub(crate) struct ArArchiveBuilder<'a> { pub(crate) struct ArArchiveBuilder<'a> {
config: ArchiveConfig<'a>, sess: &'a Session,
dst: PathBuf,
lib_search_paths: Vec<PathBuf>,
use_gnu_style_archive: bool,
no_builtin_ranlib: bool,
src_archives: Vec<(PathBuf, ar::Archive<File>)>, src_archives: Vec<(PathBuf, ar::Archive<File>)>,
// Don't use `HashMap` here, as the order is important. `rust.metadata.bin` must always be at // Don't use `HashMap` here, as the order is important. `rust.metadata.bin` must always be at
// the end of an archive for linkers to not get confused. // the end of an archive for linkers to not get confused.
@ -37,14 +34,6 @@ pub(crate) struct ArArchiveBuilder<'a> {
impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> { impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
fn new(sess: &'a Session, output: &Path, input: Option<&Path>) -> Self { fn new(sess: &'a Session, output: &Path, input: Option<&Path>) -> Self {
use rustc_codegen_ssa::back::link::archive_search_paths; use rustc_codegen_ssa::back::link::archive_search_paths;
let config = ArchiveConfig {
sess,
dst: output.to_path_buf(),
lib_search_paths: archive_search_paths(sess),
use_gnu_style_archive: sess.target.target.options.archive_format == "gnu",
// FIXME fix builtin ranlib on macOS
no_builtin_ranlib: sess.target.target.options.is_like_osx,
};
let (src_archives, entries) = if let Some(input) = input { let (src_archives, entries) = if let Some(input) = input {
let mut archive = ar::Archive::new(File::open(input).unwrap()); let mut archive = ar::Archive::new(File::open(input).unwrap());
@ -69,7 +58,13 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
}; };
ArArchiveBuilder { ArArchiveBuilder {
config, sess,
dst: output.to_path_buf(),
lib_search_paths: archive_search_paths(sess),
use_gnu_style_archive: sess.target.target.options.archive_format == "gnu",
// FIXME fix builtin ranlib on macOS
no_builtin_ranlib: sess.target.target.options.is_like_osx,
src_archives, src_archives,
entries, entries,
update_symbols: false, update_symbols: false,
@ -97,7 +92,7 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
} }
fn add_native_library(&mut self, name: rustc_span::symbol::Symbol) { fn add_native_library(&mut self, name: rustc_span::symbol::Symbol) {
let location = find_library(name, &self.config.lib_search_paths, self.config.sess); let location = find_library(name, &self.lib_search_paths, self.sess);
self.add_archive(location.clone(), |_| false) self.add_archive(location.clone(), |_| false)
.unwrap_or_else(|e| { .unwrap_or_else(|e| {
panic!( panic!(
@ -149,7 +144,7 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
Gnu(ar::GnuBuilder<File>), Gnu(ar::GnuBuilder<File>),
} }
let sess = self.config.sess; let sess = self.sess;
let mut symbol_table = BTreeMap::new(); let mut symbol_table = BTreeMap::new();
@ -179,7 +174,7 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
} }
}; };
if !self.config.no_builtin_ranlib { if !self.no_builtin_ranlib {
match object::File::parse(&data) { match object::File::parse(&data) {
Ok(object) => { Ok(object) => {
symbol_table.insert(entry_name.as_bytes().to_vec(), object.symbols().filter_map(|(_index, symbol)| { symbol_table.insert(entry_name.as_bytes().to_vec(), object.symbols().filter_map(|(_index, symbol)| {
@ -204,9 +199,9 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
entries.push((entry_name, data)); entries.push((entry_name, data));
} }
let mut builder = if self.config.use_gnu_style_archive { let mut builder = if self.use_gnu_style_archive {
BuilderKind::Gnu(ar::GnuBuilder::new( BuilderKind::Gnu(ar::GnuBuilder::new(
File::create(&self.config.dst).unwrap_or_else(|err| { File::create(&self.dst).unwrap_or_else(|err| {
sess.fatal(&format!("error opening destination during archive building: {}", err)); sess.fatal(&format!("error opening destination during archive building: {}", err));
}), }),
entries entries
@ -218,7 +213,7 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
).unwrap()) ).unwrap())
} else { } else {
BuilderKind::Bsd(ar::Builder::new( BuilderKind::Bsd(ar::Builder::new(
File::create(&self.config.dst).unwrap_or_else(|err| { File::create(&self.dst).unwrap_or_else(|err| {
sess.fatal(&format!("error opening destination during archive building: {}", err)); sess.fatal(&format!("error opening destination during archive building: {}", err));
}), }),
symbol_table, symbol_table,
@ -241,17 +236,17 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
// Finalize archive // Finalize archive
std::mem::drop(builder); std::mem::drop(builder);
if self.config.no_builtin_ranlib { if self.no_builtin_ranlib {
let ranlib = crate::toolchain::get_toolchain_binary(self.config.sess, "ranlib"); let ranlib = crate::toolchain::get_toolchain_binary(self.sess, "ranlib");
// Run ranlib to be able to link the archive // Run ranlib to be able to link the archive
let status = std::process::Command::new(ranlib) let status = std::process::Command::new(ranlib)
.arg(self.config.dst) .arg(self.dst)
.status() .status()
.expect("Couldn't run ranlib"); .expect("Couldn't run ranlib");
if !status.success() { if !status.success() {
self.config.sess.fatal(&format!("Ranlib exited with code {:?}", status.code())); self.sess.fatal(&format!("Ranlib exited with code {:?}", status.code()));
} }
} }
} }