OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rustc: Don't rpath to librustrt.dylib

Browse Source 
This library no longer exists, there's no reason for this rpath to exist any
more.
This commit is contained in:
Alex Crichton 2014-04-08 10:05:18 -07:00
parent ec996737fe
commit f9e17e1d33
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/librustc/back/rpath.rs
View File

@ -42,10 +42,9 @@ pub fn get_rpath_flags(sess: &Session, out_filename: &Path) -> Vec<~str> {
let sysroot = sess.filesearch().sysroot;
let output = out_filename;
let libs = sess.cstore.get_used_crates(cstore::RequireDynamic);
let libs = libs.move_iter().filter_map(|(_, l)| l.map(|p| p.clone())).collect();
// We don't currently rpath extern libraries, but we know
// where rustrt is and we know every rust program needs it
let libs = slice::append_one(libs, get_sysroot_absolute_rt_lib(sess));
let libs = libs.move_iter().filter_map(|(_, l)| {
l.map(|p| p.clone())
}).collect::<~[_]>();
let rpaths = get_rpaths(os, sysroot, output, libs,
sess.opts.target_triple);
@ -53,14 +52,6 @@ pub fn get_rpath_flags(sess: &Session, out_filename: &Path) -> Vec<~str> {
flags
}
fn get_sysroot_absolute_rt_lib(sess: &Session) -> Path {
let sysroot = sess.filesearch().sysroot;
let r = filesearch::relative_target_lib_path(sysroot, sess.opts.target_triple);
let mut p = sysroot.join(&r);
p.push(os::dll_filename("rustrt"));
p
}
pub fn rpaths_to_flags(rpaths: &[~str]) -> Vec<~str> {
let mut ret = Vec::new();
for rpath in rpaths.iter() {