user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Symbol in Linker.

Browse source
This commit is contained in:
Nicholas Nethercote 2019-09-05 11:23:45 +10:00
parent 5a57f46cbc
commit 482d63673c
5 changed files with 65 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/librustc_codegen_llvm/back/archive.rs
View file

@ -12,6 +12,7 @@ use crate::llvm::{self, ArchiveKind};
use rustc_codegen_ssa::{METADATA_FILENAME, RLIB_BYTECODE_EXTENSION};
use rustc_codegen_ssa::back::archive::{ArchiveBuilder, find_library};
use rustc::session::Session;
use syntax::symbol::Symbol;
struct ArchiveConfig<'a> {
pub sess: &'a Session,
@ -109,7 +110,7 @@ impl<'a> ArchiveBuilder<'a> for LlvmArchiveBuilder<'a> {
/// Adds all of the contents of a native library to this archive. This will
/// search in the relevant locations for a library named `name`.
fn add_native_library(&mut self, name: &str) {
fn add_native_library(&mut self, name: Symbol) {
let location = find_library(name, &self.config.lib_search_paths,
self.config.sess);
self.add_archive(&location, |_| false).unwrap_or_else(|e| {