squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Mac doesn't seem to support rpath $ORIGIN

Browse source
This commit is contained in:
Brian Anderson 2011-10-06 14:28:52 -07:00
parent 06087e67e1
commit e4068f6715
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/comp/back/rpath.rs
View file

@ -14,8 +14,10 @@ import util::filesearch;
export get_rpath_flags, test; export get_rpath_flags, test;
fn get_rpath_flags(sess: session::session, out_filename: str) -> [str] { fn get_rpath_flags(sess: session::session, out_filename: str) -> [str] {
let os = sess.get_targ_cfg().os;
// No rpath on windows // No rpath on windows
if sess.get_targ_cfg().os == session::os_win32 { if os == session::os_win32 {
ret []; ret [];
} }
@ -30,7 +32,7 @@ fn get_rpath_flags(sess: session::session, out_filename: str) -> [str] {
let libs = libs + [get_sysroot_absolute_rt_lib(sess)]; let libs = libs + [get_sysroot_absolute_rt_lib(sess)];
let target_triple = sess.get_opts().target_triple; let target_triple = sess.get_opts().target_triple;
let rpaths = get_rpaths(cwd, sysroot, output, libs, target_triple); let rpaths = get_rpaths(os, cwd, sysroot, output, libs, target_triple);
rpaths_to_flags(rpaths) rpaths_to_flags(rpaths)
} }
@ -47,7 +49,7 @@ fn rpaths_to_flags(rpaths: [str]) -> [str] {
vec::map({ |rpath| #fmt("-Wl,-rpath,%s",rpath)}, rpaths) vec::map({ |rpath| #fmt("-Wl,-rpath,%s",rpath)}, rpaths)
} }
fn get_rpaths(cwd: fs::path, sysroot: fs::path, fn get_rpaths(os: session::os, cwd: fs::path, sysroot: fs::path,
output: fs::path, libs: [fs::path], output: fs::path, libs: [fs::path],
target_triple: str) -> [str] { target_triple: str) -> [str] {
log #fmt("cwd: %s", cwd); log #fmt("cwd: %s", cwd);
@ -62,7 +64,7 @@ fn get_rpaths(cwd: fs::path, sysroot: fs::path,
// Use relative paths to the libraries. Binaries can be moved // Use relative paths to the libraries. Binaries can be moved
// as long as they maintain the relative relationship to the // as long as they maintain the relative relationship to the
// crates they depend on. // crates they depend on.
let rel_rpaths = get_rpaths_relative_to_output(cwd, output, libs); let rel_rpaths = get_rpaths_relative_to_output(os, cwd, output, libs);
// Make backup absolute paths to the libraries. Binaries can // Make backup absolute paths to the libraries. Binaries can
// be moved as long as the crates they link against don't move. // be moved as long as the crates they link against don't move.
@ -89,16 +91,24 @@ fn get_rpaths(cwd: fs::path, sysroot: fs::path,
ret rpaths; ret rpaths;
} }
fn get_rpaths_relative_to_output(cwd: fs::path, fn get_rpaths_relative_to_output(os: session::os,
cwd: fs::path,
output: fs::path, output: fs::path,
libs: [fs::path]) -> [str] { libs: [fs::path]) -> [str] {
vec::map(bind get_rpath_relative_to_output(cwd, output, _), libs) vec::map(bind get_rpath_relative_to_output(os, cwd, output, _), libs)
} }
fn get_rpath_relative_to_output(cwd: fs::path, fn get_rpath_relative_to_output(os: session::os,
cwd: fs::path,
output: fs::path, output: fs::path,
lib: fs::path) -> str { lib: fs::path) -> str {
"$ORIGIN" + fs::path_sep() + get_relative_to( // Mac doesn't appear to support $ORIGIN
let prefix = alt os {
session::os_linux. { "$ORIGIN" + fs::path_sep() }
session::os_macos. { "" }
};
prefix + get_relative_to(
get_absolute(cwd, output), get_absolute(cwd, output),
get_absolute(cwd, lib)) get_absolute(cwd, lib))
} }
@ -293,12 +303,21 @@ mod test {
} }
#[test] #[test]
#[cfg(target_os = "linux")]
fn test_rpath_relative() { fn test_rpath_relative() {
let res = get_rpath_relative_to_output( let res = get_rpath_relative_to_output(session::os_linux,
"/usr", "bin/rustc", "lib/libstd.so"); "/usr", "bin/rustc", "lib/libstd.so");
assert res == "$ORIGIN/../lib"; assert res == "$ORIGIN/../lib";
} }
#[test]
#[cfg(target_os = "macos")]
fn test_rpath_relative() {
let res = get_rpath_relative_to_output(session::os_macos,
"/usr", "bin/rustc", "lib/libstd.so");
assert res == "../lib";
}
#[test] #[test]
fn test_get_absolute_rpath() { fn test_get_absolute_rpath() {
let res = get_absolute_rpath("/usr", "lib/libstd.so"); let res = get_absolute_rpath("/usr", "lib/libstd.so");