diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-03-15 14:41:48 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-03-15 14:41:48 +0000 |
| commit | 7b3bd56ed99d5031f57b1aaf814117b2a7ce9c84 (patch) | |
| tree | 88e4d7dd16d168ae7700eb2433827d30cbe898bf /scripts/setup_rust_fork.sh | |
| parent | 2c122a8926274dc6bdedcbef7974539f05af627a (diff) | |
| download | rust-7b3bd56ed99d5031f57b1aaf814117b2a7ce9c84.tar.gz rust-7b3bd56ed99d5031f57b1aaf814117b2a7ce9c84.zip | |
Merge commit 'dec0daa8f6d0a0e1c702f169abb6bf3eee198c67' into sync_cg_clif-2023-03-15
Diffstat (limited to 'scripts/setup_rust_fork.sh')
| -rw-r--r-- | scripts/setup_rust_fork.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh index a08e80dd19a..abb09775d21 100644 --- a/scripts/setup_rust_fork.sh +++ b/scripts/setup_rust_fork.sh @@ -10,7 +10,7 @@ git fetch git checkout -- . git checkout "$(rustc -V | cut -d' ' -f3 | tr -d '(')" -git -c user.name=Dummy -c user.email=dummy@example.com am ../patches/*-sysroot-*.patch +git -c user.name=Dummy -c user.email=dummy@example.com am ../patches/*-stdlib-*.patch git apply - <<EOF diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml @@ -36,7 +36,7 @@ changelog-seen = 2 ninja = false [build] -rustc = "$(pwd)/../dist/rustc-clif" +rustc = "$(pwd)/../dist/bin/rustc-clif" cargo = "$(rustup which cargo)" full-bootstrap = true local-rebuild = true |