---

yaml
---
r: 64419
b: refs/heads/snap-stage3
c: d300a64
h: refs/heads/master
i:
  64417: 72a3abe
  64415: 4a6c559
v: v3

Author: pcwalton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: a1cd1429fb6f007735a3de792b5ba8ba24cd5328
+refs/heads/snap-stage3: d300a64520294eac39a649c276b0b41a62a0fb99
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/configure

@@ -921,6 +921,9 @@ do
         esac
         need_ok "LLVM configure failed"
 
+        # Hack the tools Makefile to turn off the clang build
+        sed -i 's/clang//g' tools/Makefile
+
         cd $CFG_BUILD_DIR
     fi
 

branches/snap-stage3/src/compiletest/compiletest.rs

@@ -230,9 +230,9 @@ pub fn test_opts(config: &config) -> test::TestOpts {
         logfile: config.logfile.clone(),
         run_tests: true,
         run_benchmarks: true,
-        ratchet_metrics: copy config.ratchet_metrics,
-        ratchet_noise_percent: copy config.ratchet_noise_percent,
-        save_metrics: copy config.save_metrics,
+        ratchet_metrics: config.ratchet_metrics.clone(),
+        ratchet_noise_percent: config.ratchet_noise_percent.clone(),
+        save_metrics: config.save_metrics.clone(),
     }
 }
 
@@ -315,7 +315,7 @@ pub fn make_test_closure(config: &config, testfile: &Path) -> test::TestFn {
 
 pub fn make_metrics_test_closure(config: &config, testfile: &Path) -> test::TestFn {
     use std::cell::Cell;
-    let config = Cell::new(copy *config);
+    let config = Cell::new((*config).clone());
     let testfile = Cell::new(testfile.to_str());
     test::DynMetricFn(|mm| { runtest::run_metrics(config.take(), testfile.take(), mm) })
 }