./y.sh prepare patch does not apply

[ramidzkh]

Trying to run ./y.sh prepare in a current clone with the example config copied over and using a local gcc build:

root@d60bd2eeb984:/w/rustc_codegen_gcc# ./y.sh prepare      
[BUILD] build system
    Finished `release` profile [optimized] target(s) in 0.01s
[GIT] init (cwd): `build/build_sysroot/sysroot_src`
[GIT] add (cwd): `build/build_sysroot/sysroot_src`
[GIT] commit (cwd): `build/build_sysroot/sysroot_src`
[GIT] apply `patches/0001-Add-stdarch-Cargo.toml-for-testing.patch`
[master 6281c97] Patch ../../../patches/0001-Add-stdarch-Cargo.toml-for-testing.patch
 1 file changed, 21 insertions(+)
 create mode 100644 library/stdarch/Cargo.toml
[GIT] apply `patches/0028-core-Disable-long-running-tests.patch`
[master f8fb931] Patch ../../../patches/0028-core-Disable-long-running-tests.patch
 1 file changed, 2 insertions(+)
Successfully prepared libcore for building
`rand` has already been cloned
`regex` has already been cloned
`simple-raytracer` has already been cloned
[GIT] apply `patches/crates/0001-Remove-deny-warnings.patch`
error: patch failed: src/lib.rs:47
error: src/lib.rs: patch does not apply
Command `["git", "apply", "../../patches/crates/0001-Remove-deny-warnings.patch"]` failed
Command failed to run: Command `git apply ../../patches/crates/0001-Remove-deny-warnings.patch` (running in folder `build/rand`) exited with status Some(1)

Removing the prepare_rand()?; in build_system/src/prepare.rs fixed it for me. build/rand looks like rand 0.9.0.

[antoyo]

Thanks for sharing this.
I cannot reproduce. Could you please try running ./y.sh clean all and rm -Rf build and try again to see if that still happens?

Which OS are you using?

[ramidzkh]

Ah, the issue seems to be when you ./y.sh prepare on a fresh container without your git name/email, and even when you do fix it, the patch doesn't apply until you clean everything and try again.

FROM ubuntu:noble

apt-get update
apt-get install -y build-essential libgmp-dev libmpfr-dev libmpc-dev libncurses5-dev flex bison autogen dejagnu git wget

export RUSTUP_HOME=/usr/local/rustup
export CARGO_HOME=/usr/local/cargo
export PATH=/usr/local/cargo/bin:$PATH
export RUST_VERSION=nightly-2025-06-28-x86_64-unknown-linux-gnu

wget https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init
chmod +x ./rustup-init
./rustup-init -y --no-modify-path --profile complete --default-toolchain $RUST_VERSION --default-host x86_64-unknown-linux-gnu
chmod -R a+w $RUSTUP_HOME $CARGO_HOME

# remove this to get the error when applying the patch. then run this and try ./y.sh prepare, and it'll still fail
  git config --global user.email "you@example.com"
  git config --global user.name "Your Name"

git clone https://github.com/rust-lang/rustc_codegen_gcc
cd rustc_codegen_gcc
./y.sh prepare

Details

Author identity unknown

*** Please tell me who you are.

Run

  git config --global user.email "you@example.com"
  git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: unable to auto-detect email address (got 'root@466bea11708a.(none)')
Command `["git", "commit", "--no-gpg-sign", "-m", "Patch ../../patches/crates/0001-Remove-deny-warnings.patch"]` failed
Command failed to run: Command `git commit --no-gpg-sign -m Patch ../../patches/crates/0001-Remove-deny-warnings.patch` (running in folder `build/rand`) exited with status Some(128)
root@466bea11708a:/w/rustc_codegen_gcc#   git config --global user.email "you@example.com"
  git config --global user.name "Your Name"
root@466bea11708a:/w/rustc_codegen_gcc# ./y.sh prepare
[BUILD] build system
    Finished `release` profile [optimized] target(s) in 0.00s
[GIT] init (cwd): `build/build_sysroot/sysroot_src`
[GIT] add (cwd): `build/build_sysroot/sysroot_src`
[GIT] commit (cwd): `build/build_sysroot/sysroot_src`
[GIT] apply `patches/0001-Add-stdarch-Cargo.toml-for-testing.patch`
[master e2c1362] Patch ../../../patches/0001-Add-stdarch-Cargo.toml-for-testing.patch
 1 file changed, 21 insertions(+)
 create mode 100644 library/stdarch/Cargo.toml
[GIT] apply `patches/0028-core-Disable-long-running-tests.patch`
[master 4977b32] Patch ../../../patches/0028-core-Disable-long-running-tests.patch
 1 file changed, 2 insertions(+)
Successfully prepared libcore for building
`rand` has already been cloned
`regex` has already been cloned
`simple-raytracer` has already been cloned
[GIT] apply `patches/crates/0001-Remove-deny-warnings.patch`
error: patch failed: src/lib.rs:47
error: src/lib.rs: patch does not apply
Command `["git", "apply", "../../patches/crates/0001-Remove-deny-warnings.patch"]` failed
Command failed to run: Command `git apply ../../patches/crates/0001-Remove-deny-warnings.patch` (running in folder `build/rand`) exited with status Some(1)

[antoyo]

Oh yeah. We should definitely improve the error message here.