From a9a4e2420108c3a05cfb13e53b4c9e6ca9e982a4 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 15 Apr 2014 18:25:38 -0700 Subject: [PATCH] workcache: Don't assume gcc exists on all platforms FreeBSD has recently moved to clang by default, and no longer ship gcc. Instead use "cc" on unix platforms (the default compiler) and "gcc" on windows. --- src/libworkcache/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libworkcache/lib.rs b/src/libworkcache/lib.rs index 623488ac6129d..7dd2d945c26c7 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();