Skip to content

Commit 633cd9b

Browse files
committed
---
yaml --- r: 5712 b: refs/heads/master c: 062ba22 h: refs/heads/master v: v3
1 parent 9fb5a03 commit 633cd9b

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: d8a85f0758981c8e761c6767992065c4cad2f0aa
2+
refs/heads/master: 062ba22d997918f9903127d2158449a8d49134d9

trunk/src/comp/back/rpath.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@ import util::filesearch;
1313
// to be exported
1414
export get_rpath_flags, test;
1515

16-
#[cfg(target_os="linux")]
17-
#[cfg(target_os="macos")]
1816
fn get_rpath_flags(sess: session::session, out_filename: str) -> [str] {
17+
// No rpath on windows
18+
if sess.get_targ_cfg().os == session::os_win32 {
19+
ret [];
20+
}
21+
1922
log "preparing the RPATH!";
2023

2124
let cwd = os::getcwd();
@@ -31,11 +34,6 @@ fn get_rpath_flags(sess: session::session, out_filename: str) -> [str] {
3134
rpaths_to_flags(rpaths)
3235
}
3336

34-
#[cfg(target_os="win32")]
35-
fn get_rpath_flags(_sess: session::session, _out_filename: str) -> [str] {
36-
[]
37-
}
38-
3937
fn get_sysroot_absolute_rt_lib(sess: session::session) -> fs::path {
4038
let path = [sess.filesearch().sysroot()]
4139
+ filesearch::relative_target_lib_path(

0 commit comments

Comments
 (0)