Sync from rust 28d73a3ee3e2c32f2768d1cbc9b42cb63472e9e9

[rust.git] / prepare.sh

diff --git a/prepare.sh b/prepare.sh
index 6795558422ff75d1bd09a3d8f383717827813605..08e7cb1802999867d9427d58f478983dbe7fd133 100755 (executable)
--- a/prepare.sh
+++ b/prepare.sh
@@ -1,15 +1,21 @@
 #!/bin/bash --verbose
 set -e
 
-rustup component add rust-src
+rustup component add rust-src rustc-dev llvm-tools-preview
 ./build_sysroot/prepare_sysroot_src.sh
 cargo install hyperfine || echo "Skipping hyperfine install"
 
+git clone https://github.com/rust-random/rand.git || echo "rust-random/rand has already been cloned"
+pushd rand
+git checkout -- .
+git checkout 0f933f9c7176e53b2a3c7952ded484e1783f0bf1
+git am ../crate_patches/*-rand-*.patch
+popd
+
 git clone https://github.com/rust-lang/regex.git || echo "rust-lang/regex has already been cloned"
 pushd regex
 git checkout -- .
 git checkout 341f207c1071f7290e3f228c710817c280c8dca1
-git apply ../crate_patches/regex.patch
 popd
 
 git clone https://github.com/ebobby/simple-raytracer || echo "ebobby/simple-raytracer has already been cloned"
@@ -18,6 +24,7 @@ git checkout -- .
 git checkout 804a7a21b9e673a482797aa289a18ed480e4d813
 
 # build with cg_llvm for perf comparison
+unset CARGO_TARGET_DIR
 cargo build
 mv target/debug/main raytracer_cg_llvm
 popd