diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2018-03-15 17:29:53 -0600 |
|---|---|---|
| committer | Mark Simulacrum <mark.simulacrum@gmail.com> | 2018-04-03 11:41:51 -0600 |
| commit | f4620a3d1471fd7943ebd413dcbc94d51bcfea8e (patch) | |
| tree | fc6a6f50535194a59a56903776f64521149375fd /src/bootstrap/builder.rs | |
| parent | 42fde21c27c67ce3c665e344b602cfd1d22842cc (diff) | |
| download | rust-f4620a3d1471fd7943ebd413dcbc94d51bcfea8e.tar.gz rust-f4620a3d1471fd7943ebd413dcbc94d51bcfea8e.zip | |
Stub out less code
Diffstat (limited to 'src/bootstrap/builder.rs')
| -rw-r--r-- | src/bootstrap/builder.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 80136aa86e3..49d4864190a 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -691,7 +691,7 @@ impl<'a> Builder<'a> { // the options through environment variables that are fetched and understood by both. // // FIXME: the guard against msvc shouldn't need to be here - if !target.contains("msvc") && !cfg!(test) { + if !target.contains("msvc") { let ccache = self.config.ccache.as_ref(); let ccacheify = |s: &Path| { let ccache = match ccache { @@ -874,6 +874,8 @@ mod __test { fn configure(host: &[&str], target: &[&str]) -> Config { let mut config = Config::default_opts(); + // don't save toolstates + config.save_toolstates = None; config.run_host_only = true; config.build = INTERNER.intern_str("A"); config.hosts = vec![config.build].clone().into_iter() |