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

Auto merge of #56397 - petrhosek:file-search, r=cramertj

Browse source 
Search other library paths when loking for link objects

Support the case when link objects are not located in Rust sysroot
but in other locations which could be specify through library paths.
This commit is contained in:
bors 2018-12-19 06:46:15 +00:00
commit e7b4bc35e9
3 changed files with 46 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/librustc_codegen_llvm/back/link.rs
View file

@ -457,6 +457,21 @@ fn print_native_static_libs(sess: &Session, all_native_libs: &[NativeLibrary]) {
}
}
fn get_file_path(sess: &Session, name: &str) -> PathBuf {
let fs = sess.target_filesearch(PathKind::Native);
let file_path = fs.get_lib_path().join(name);
if file_path.exists() {
return file_path
}
for search_path in fs.search_paths() {
let file_path = search_path.dir.join(name);
if file_path.exists() {
return file_path
}
}
PathBuf::from(name)
}
// Create a dynamic library or executable
//
// This will invoke the system linker/cc to create the resulting file. This
@ -472,7 +487,6 @@ fn link_natively(sess: &Session,
// The invocations of cc share some flags across platforms
let (pname, mut cmd) = get_linker(sess, &linker, flavor);
let root = sess.target_filesearch(PathKind::Native).get_lib_path();
if let Some(args) = sess.target.target.options.pre_link_args.get(&flavor) {
cmd.args(args);
}
@ -500,12 +514,12 @@ fn link_natively(sess: &Session,
&sess.target.target.options.pre_link_objects_dll
};
for obj in pre_link_objects {
cmd.arg(root.join(obj));
cmd.arg(get_file_path(sess, obj));
}
if crate_type == config::CrateType::Executable && sess.crt_static() {
for obj in &sess.target.target.options.pre_link_objects_exe_crt {
cmd.arg(root.join(obj));
cmd.arg(get_file_path(sess, obj));
}
}
@ -529,11 +543,11 @@ fn link_natively(sess: &Session,
cmd.args(args);
}
for obj in &sess.target.target.options.post_link_objects {
cmd.arg(root.join(obj));
cmd.arg(get_file_path(sess, obj));
}
if sess.crt_static() {
for obj in &sess.target.target.options.post_link_objects_crt {
cmd.arg(root.join(obj));
cmd.arg(get_file_path(sess, obj));
}
}
if let Some(args) = sess.target.target.options.post_link_args.get(&flavor) {