69 lines
1.9 KiB
Bash
69 lines
1.9 KiB
Bash
#!/bin/bash
|
|
set -e
|
|
|
|
./build.sh
|
|
source build/config.sh
|
|
|
|
echo "[SETUP] Rust fork"
|
|
git clone https://github.com/rust-lang/rust.git || true
|
|
pushd rust
|
|
git fetch
|
|
git checkout -- .
|
|
git checkout "$(rustc -V | cut -d' ' -f3 | tr -d '(')"
|
|
|
|
git apply - <<EOF
|
|
diff --git a/Cargo.toml b/Cargo.toml
|
|
index 5bd1147cad5..10d68a2ff14 100644
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -111,5 +111,7 @@ rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
|
|
rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
|
|
rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
|
|
|
|
+compiler_builtins = { path = "../build_sysroot/compiler-builtins" }
|
|
+
|
|
[patch."https://github.com/rust-lang/rust-clippy"]
|
|
clippy_lints = { path = "src/tools/clippy/clippy_lints" }
|
|
diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml
|
|
index 23e689fcae7..5f077b765b6 100644
|
|
--- a/compiler/rustc_data_structures/Cargo.toml
|
|
+++ b/compiler/rustc_data_structures/Cargo.toml
|
|
@@ -32,7 +32,6 @@ tempfile = "3.0.5"
|
|
|
|
[dependencies.parking_lot]
|
|
version = "0.11"
|
|
-features = ["nightly"]
|
|
|
|
[target.'cfg(windows)'.dependencies]
|
|
winapi = { version = "0.3", features = ["fileapi", "psapi"] }
|
|
diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml
|
|
index d95b5b7f17f..00b6f0e3635 100644
|
|
--- a/library/alloc/Cargo.toml
|
|
+++ b/library/alloc/Cargo.toml
|
|
@@ -8,7 +8,7 @@ edition = "2018"
|
|
|
|
[dependencies]
|
|
core = { path = "../core" }
|
|
-compiler_builtins = { version = "0.1.39", features = ['rustc-dep-of-std'] }
|
|
+compiler_builtins = { version = "0.1.39", features = ['rustc-dep-of-std', 'no-asm'] }
|
|
|
|
[dev-dependencies]
|
|
rand = "0.7"
|
|
EOF
|
|
|
|
cat > config.toml <<EOF
|
|
[llvm]
|
|
ninja = false
|
|
|
|
[build]
|
|
rustc = "$(pwd)/../build/bin/cg_clif"
|
|
cargo = "$(rustup which cargo)"
|
|
full-bootstrap = true
|
|
local-rebuild = true
|
|
|
|
[rust]
|
|
codegen-backends = ["cranelift"]
|
|
deny-warnings = false
|
|
EOF
|
|
popd
|