Skip to content

Commit 83ae17d

Browse files
committed
rustc: Don't rpath to librustrt.dylib
This library no longer exists, there's no reason for this rpath to exist any more.
1 parent 9539b95 commit 83ae17d

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

src/librustc/back/rpath.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,16 @@ pub fn get_rpath_flags(sess: &Session, out_filename: &Path) -> Vec<~str> {
4242
let sysroot = sess.filesearch().sysroot;
4343
let output = out_filename;
4444
let libs = sess.cstore.get_used_crates(cstore::RequireDynamic);
45-
let libs = libs.move_iter().filter_map(|(_, l)| l.map(|p| p.clone())).collect();
46-
// We don't currently rpath extern libraries, but we know
47-
// where rustrt is and we know every rust program needs it
48-
let libs = slice::append_one(libs, get_sysroot_absolute_rt_lib(sess));
45+
let libs = libs.move_iter().filter_map(|(_, l)| {
46+
l.map(|p| p.clone())
47+
}).collect::<~[_]>();
4948

5049
let rpaths = get_rpaths(os, sysroot, output, libs,
5150
sess.opts.target_triple);
5251
flags.push_all(rpaths_to_flags(rpaths.as_slice()).as_slice());
5352
flags
5453
}
5554

56-
fn get_sysroot_absolute_rt_lib(sess: &Session) -> Path {
57-
let sysroot = sess.filesearch().sysroot;
58-
let r = filesearch::relative_target_lib_path(sysroot, sess.opts.target_triple);
59-
let mut p = sysroot.join(&r);
60-
p.push(os::dll_filename("rustrt"));
61-
p
62-
}
63-
6455
pub fn rpaths_to_flags(rpaths: &[~str]) -> Vec<~str> {
6556
let mut ret = Vec::new();
6657
for rpath in rpaths.iter() {

0 commit comments

Comments
 (0)