bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Revert "rustbuild: Pass ccache to build scripts"

Browse source 
This reverts commit 64a8730e17.
This commit is contained in:
Alex Crichton 2018-02-14 07:44:53 -08:00 • committed by kennytm
parent ec36e7e972
commit e0da9902a1
No known key found for this signature in database
GPG key ID: FEF6C8051D0E013C
1 changed files with 5 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/bootstrap/builder.rs
View file

@ -600,25 +600,9 @@ impl<'a> Builder<'a> {
// //
// FIXME: the guard against msvc shouldn't need to be here // FIXME: the guard against msvc shouldn't need to be here
if !target.contains("msvc") { if !target.contains("msvc") {
let ccache = self.config.ccache.as_ref(); let cc = self.cc(target);
let ccacheify = |s: &Path| { cargo.env(format!("CC_{}", target), cc)
let ccache = match ccache { .env("CC", cc);
Some(ref s) => s,
None => return s.display().to_string(),
};
// FIXME: the cc-rs crate only recognizes the literal strings
// `ccache` and `sccache` when doing caching compilations, so we
// mirror that here. It should probably be fixed upstream to
// accept a new env var or otherwise work with custom ccache
// vars.
match &ccache[..] {
"ccache" | "sccache" => format!("{} {}", ccache, s.display()),
_ => s.display().to_string(),
}
};
let cc = ccacheify(&self.cc(target));
cargo.env(format!("CC_{}", target), &cc)
.env("CC", &cc);
let cflags = self.cflags(target).join(" "); let cflags = self.cflags(target).join(" ");
cargo.env(format!("CFLAGS_{}", target), cflags.clone()) cargo.env(format!("CFLAGS_{}", target), cflags.clone())
@ -633,9 +617,8 @@ impl<'a> Builder<'a> {
} }
if let Ok(cxx) = self.cxx(target) { if let Ok(cxx) = self.cxx(target) {
let cxx = ccacheify(&cxx); cargo.env(format!("CXX_{}", target), cxx)
cargo.env(format!("CXX_{}", target), &cxx) .env("CXX", cxx)
.env("CXX", &cxx)
.env(format!("CXXFLAGS_{}", target), cflags.clone()) .env(format!("CXXFLAGS_{}", target), cflags.clone())
.env("CXXFLAGS", cflags); .env("CXXFLAGS", cflags);
} }