Skip to content

Commit 2d63517

Browse files
committed
Windows fixes
1 parent 933897c commit 2d63517

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

mk/rt.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ RUNTIME_S_$(1)_$(2) := rt/arch/$$(HOST_$(1))/_context.S \
9797
ifeq ($$(CFG_WINDOWSY_$(1)), 1)
9898
LIBUV_OSTYPE_$(1)_$(2) := win
9999
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a
100-
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/libjemalloc_pic.a
100+
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/jemalloc.lib
101101
else ifeq ($(OSTYPE_$(1)), apple-darwin)
102102
LIBUV_OSTYPE_$(1)_$(2) := mac
103103
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a

src/compiletest/procsrv.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ use core::os;
1717
use core::run;
1818
use core::str;
1919
use core::task;
20+
use core::vec;
2021

2122
#[cfg(target_os = "win32")]
2223
fn target_env(lib_path: &str, prog: &str) -> ~[(~str,~str)] {
@@ -28,7 +29,7 @@ fn target_env(lib_path: &str, prog: &str) -> ~[(~str,~str)] {
2829
let aux_path = prog.slice(0u, prog.len() - 4u).to_owned() + ".libaux";
2930

3031
env = do vec::map(env) |pair| {
31-
let (k,v) = *pair;
32+
let (k,v) = copy *pair;
3233
if k == ~"PATH" { (~"PATH", v + ";" + lib_path + ";" + aux_path) }
3334
else { (k,v) }
3435
};

0 commit comments

Comments
 (0)