about summary refs log tree commit diff
path: root/scripts/setup_rust_fork.sh
diff options
context:
space:
mode:
authorbjorn3 <bjorn3@users.noreply.github.com>2021-07-07 11:14:20 +0200
committerbjorn3 <bjorn3@users.noreply.github.com>2021-07-07 11:14:20 +0200
commitfb92375755a00a39a900da50f581917519b5af6b (patch)
tree479b4faf1a6fd9d4ddce341c8dd7eac792797b6a /scripts/setup_rust_fork.sh
parent4cfa1fcb5b566e9bbe24fafb77027a39685dfe6b (diff)
downloadrust-fb92375755a00a39a900da50f581917519b5af6b.tar.gz
rust-fb92375755a00a39a900da50f581917519b5af6b.zip
Merge commit '3a31c6d8272c14388a34622193baf553636fe470' into sync_cg_clif-2021-07-07
Diffstat (limited to 'scripts/setup_rust_fork.sh')
-rw-r--r--scripts/setup_rust_fork.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh
index 43c4887669c..52adaaa8de6 100644
--- a/scripts/setup_rust_fork.sh
+++ b/scripts/setup_rust_fork.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-./build.sh
-source build/config.sh
+./y.rs build
+source scripts/config.sh
 
 echo "[SETUP] Rust fork"
 git clone https://github.com/rust-lang/rust.git || true
@@ -33,7 +33,7 @@ index d95b5b7f17f..00b6f0e3635 100644
  [dependencies]
  core = { path = "../core" }
 -compiler_builtins = { version = "0.1.40", features = ['rustc-dep-of-std'] }
-+compiler_builtins = { version = "0.1.43", features = ['rustc-dep-of-std', 'no-asm'] }
++compiler_builtins = { version = "0.1.45", features = ['rustc-dep-of-std', 'no-asm'] }
 
  [dev-dependencies]
  rand = "0.7"