diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-10-06 13:11:56 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-10-06 13:12:11 -0700 |
| commit | 062ba22d997918f9903127d2158449a8d49134d9 (patch) | |
| tree | 186f9caf81a89a293da019ac3a7d9546b7090c77 /src/comp | |
| parent | d8a85f0758981c8e761c6767992065c4cad2f0aa (diff) | |
| download | rust-062ba22d997918f9903127d2158449a8d49134d9.tar.gz rust-062ba22d997918f9903127d2158449a8d49134d9.zip | |
rpathing is based on the target, not host OS
Diffstat (limited to 'src/comp')
| -rw-r--r-- | src/comp/back/rpath.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/comp/back/rpath.rs b/src/comp/back/rpath.rs index 51b7da7fbf6..6c542a8a1a4 100644 --- a/src/comp/back/rpath.rs +++ b/src/comp/back/rpath.rs @@ -13,9 +13,12 @@ import util::filesearch; // to be exported export get_rpath_flags, test; -#[cfg(target_os="linux")] -#[cfg(target_os="macos")] fn get_rpath_flags(sess: session::session, out_filename: str) -> [str] { + // No rpath on windows + if sess.get_targ_cfg().os == session::os_win32 { + ret []; + } + log "preparing the RPATH!"; let cwd = os::getcwd(); @@ -31,11 +34,6 @@ fn get_rpath_flags(sess: session::session, out_filename: str) -> [str] { rpaths_to_flags(rpaths) } -#[cfg(target_os="win32")] -fn get_rpath_flags(_sess: session::session, _out_filename: str) -> [str] { - [] -} - fn get_sysroot_absolute_rt_lib(sess: session::session) -> fs::path { let path = [sess.filesearch().sysroot()] + filesearch::relative_target_lib_path( |