diff options
| author | bors <bors@rust-lang.org> | 2014-04-15 23:36:58 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-04-15 23:36:58 -0700 |
| commit | 349d66af9420eeeeedfc648eb6ec3fd28015d4b3 (patch) | |
| tree | 9789ea9a2b13b61b570bd896fe203a36bc08103c /src/libworkcache | |
| parent | 74bd2338eb25d0d165458a09d7aab3d2ecb98c48 (diff) | |
| parent | c18c9284b352f3605553343cd78c7a8eb75b5cd2 (diff) | |
| download | rust-349d66af9420eeeeedfc648eb6ec3fd28015d4b3.tar.gz rust-349d66af9420eeeeedfc648eb6ec3fd28015d4b3.zip | |
auto merge of #13532 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/libworkcache')
| -rw-r--r-- | src/libworkcache/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libworkcache/lib.rs b/src/libworkcache/lib.rs index 623488ac612..7dd2d945c26 100644 --- a/src/libworkcache/lib.rs +++ b/src/libworkcache/lib.rs @@ -512,8 +512,9 @@ fn test() { prep.declare_input("file", pth.as_str().unwrap(), file_content); prep.exec(proc(_exe) { let out = make_path(~"foo.o"); + let compiler = if cfg!(windows) {"gcc"} else {"cc"}; // FIXME (#9639): This needs to handle non-utf8 paths - Process::status("gcc", [pth.as_str().unwrap().to_owned(), + Process::status(compiler, [pth.as_str().unwrap().to_owned(), ~"-o", out.as_str().unwrap().to_owned()]).unwrap(); |