diff options
| author | Corey Richardson <corey@octayn.net> | 2013-06-01 17:50:26 -0400 |
|---|---|---|
| committer | Corey Richardson <corey@octayn.net> | 2013-06-01 17:50:26 -0400 |
| commit | 2d635179f0bd1493f55768c0c56ebaea5f63e2b1 (patch) | |
| tree | ff8917223dd86200bd31cb550e8d9d0af21b53cd | |
| parent | 933897c5f57cb2ec2e8b53829b74a4b2b572f718 (diff) | |
| download | rust-2d635179f0bd1493f55768c0c56ebaea5f63e2b1.tar.gz rust-2d635179f0bd1493f55768c0c56ebaea5f63e2b1.zip | |
Windows fixes
| -rw-r--r-- | mk/rt.mk | 2 | ||||
| -rw-r--r-- | src/compiletest/procsrv.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mk/rt.mk b/mk/rt.mk index 025639bf91d..08cae2733dc 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -97,7 +97,7 @@ RUNTIME_S_$(1)_$(2) := rt/arch/$$(HOST_$(1))/_context.S \ ifeq ($$(CFG_WINDOWSY_$(1)), 1) LIBUV_OSTYPE_$(1)_$(2) := win LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a - JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/libjemalloc_pic.a + JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/jemalloc.lib else ifeq ($(OSTYPE_$(1)), apple-darwin) LIBUV_OSTYPE_$(1)_$(2) := mac LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a diff --git a/src/compiletest/procsrv.rs b/src/compiletest/procsrv.rs index 8285986d67e..62f0731dab6 100644 --- a/src/compiletest/procsrv.rs +++ b/src/compiletest/procsrv.rs @@ -17,6 +17,7 @@ use core::os; use core::run; use core::str; use core::task; +use core::vec; #[cfg(target_os = "win32")] fn target_env(lib_path: &str, prog: &str) -> ~[(~str,~str)] { @@ -28,7 +29,7 @@ fn target_env(lib_path: &str, prog: &str) -> ~[(~str,~str)] { let aux_path = prog.slice(0u, prog.len() - 4u).to_owned() + ".libaux"; env = do vec::map(env) |pair| { - let (k,v) = *pair; + let (k,v) = copy *pair; if k == ~"PATH" { (~"PATH", v + ";" + lib_path + ";" + aux_path) } else { (k,v) } }; |