File tree 2 files changed +11
-2
lines changed
trunk/src/test/compiletest
2 files changed +11
-2
lines changed Original file line number Diff line number Diff line change 1
1
---
2
- refs/heads/master: b61e17bdfd5de3546d756cf3cc0e91fbb3c0ef0f
2
+ refs/heads/master: 196cc6de2e517d4a265990409132e6064e487f4f
Original file line number Diff line number Diff line change @@ -10,7 +10,9 @@ fn make_new_path(path: str) -> str {
10
10
// Windows just uses PATH as the library search path, so we have to
11
11
// maintain the current value while adding our own
12
12
alt getenv ( lib_path_env_var ( ) ) {
13
- option:: some ( curr) { #fmt[ "%s:%s" , path, curr] }
13
+ option:: some ( curr) {
14
+ #fmt[ "%s%s%s" , path, path_div ( ) , curr]
15
+ }
14
16
option:: none. { path }
15
17
}
16
18
}
@@ -24,6 +26,13 @@ fn lib_path_env_var() -> str { "DYLD_LIBRARY_PATH" }
24
26
#[ cfg( target_os = "win32" ) ]
25
27
fn lib_path_env_var ( ) -> str { "PATH" }
26
28
29
+ #[ cfg( target_os = "linux" ) ]
30
+ #[ cfg( target_os = "macos" ) ]
31
+ fn path_div ( ) -> str { ":" }
32
+
33
+ #[ cfg( target_os = "win32" ) ]
34
+ fn path_div ( ) -> str { ";" }
35
+
27
36
fn logv ( config : config , s : str ) {
28
37
log s;
29
38
if config. verbose { io:: stdout ( ) . write_line ( s) ; }
You can’t perform that action at this time.
0 commit comments