4 ./y.rs build --no-unstable-features
5 source scripts/config.sh
7 echo "[SETUP] Rust fork"
8 git clone https://github.com/rust-lang/rust.git || true
12 git checkout "$(rustc -V | cut -d' ' -f3 | tr -d '(')"
15 diff --git a/Cargo.toml b/Cargo.toml
16 index 5bd1147cad5..10d68a2ff14 100644
19 @@ -111,5 +111,7 @@ rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
20 rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
21 rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
23 +compiler_builtins = { path = "../build_sysroot/compiler-builtins" }
25 [patch."https://github.com/rust-lang/rust-clippy"]
26 clippy_lints = { path = "src/tools/clippy/clippy_lints" }
27 diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml
28 index d95b5b7f17f..00b6f0e3635 100644
29 --- a/library/alloc/Cargo.toml
30 +++ b/library/alloc/Cargo.toml
31 @@ -8,7 +8,7 @@ edition = "2018"
34 core = { path = "../core" }
35 -compiler_builtins = { version = "0.1.40", features = ['rustc-dep-of-std'] }
36 +compiler_builtins = { version = "0.1.66", features = ['rustc-dep-of-std', 'no-asm'] }
41 diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
42 index 887d27fd6dca4..2c2239f2b83d1 100644
43 --- a/src/tools/compiletest/src/header.rs
44 +++ b/src/tools/compiletest/src/header.rs
45 @@ -806,8 +806,8 @@ pub fn make_test_description<R: Read>(
48 let mut ignore = false;
49 #[cfg(not(bootstrap))]
50 - let ignore_message: Option<String> = None;
51 + let ignore_message: Option<&str> = None;
52 let mut should_fail = false;
54 let rustc_has_profiler_support = env::var_os("RUSTC_PROFILER_SUPPORT").is_some();
56 diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
57 index 8431aa7b818..a3ff7e68ce5 100644
58 --- a/src/tools/compiletest/src/runtest.rs
59 +++ b/src/tools/compiletest/src/runtest.rs
60 @@ -3489,11 +3489,7 @@ fn normalize_output(&self, output: &str, custom_rules: &[(String, String)]) -> S
62 normalize_path(&src_dir, "$(echo '$SRC_DIR')");
64 - if let Some(virtual_rust_source_base_dir) =
65 - option_env!("CFG_VIRTUAL_RUST_SOURCE_BASE_DIR").map(PathBuf::from)
67 - normalize_path(&virtual_rust_source_base_dir.join("library"), "$(echo '$SRC_DIR')");
69 + normalize_path(&Path::new("$(cd ../build_sysroot/sysroot_src/library; pwd)"), "$(echo '$SRC_DIR')");
71 // Paths into the build directory
72 let test_build_dir = &self.config.build_base;
75 cat > config.toml <<EOF
82 rustc = "$(pwd)/../build/bin/cg_clif"
83 cargo = "$(rustup which cargo)"
88 codegen-backends = ["cranelift"]