diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-07-22 13:32:34 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-07-22 13:32:34 +0000 |
| commit | e8168ce8a3fde85460481dfba2296eb7e6bc5060 (patch) | |
| tree | 9c529fcbd1aa28e76d0a5136dc70a9f89f61b007 /scripts/setup_rust_fork.sh | |
| parent | 648f5e4208e1e88b9048170f05095e483bb9b2d7 (diff) | |
| download | rust-e8168ce8a3fde85460481dfba2296eb7e6bc5060.tar.gz rust-e8168ce8a3fde85460481dfba2296eb7e6bc5060.zip | |
Merge commit '1eded3619d0e55d57521a259bf27a03906fdfad0' into sync_cg_clif-2023-07-22
Diffstat (limited to 'scripts/setup_rust_fork.sh')
| -rw-r--r-- | scripts/setup_rust_fork.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh index 15b16b42be5..e6bbac647e5 100644 --- a/scripts/setup_rust_fork.sh +++ b/scripts/setup_rust_fork.sh @@ -10,7 +10,8 @@ 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/*-stdlib-*.patch +git -c user.name=Dummy -c user.email=dummy@example.com -c commit.gpgSign=false \ + am ../patches/*-stdlib-*.patch git apply - <<EOF diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml @@ -51,7 +52,7 @@ popd # FIXME remove once inline asm is fully supported export RUSTFLAGS="$RUSTFLAGS --cfg=rustix_use_libc" -export CFG_VIRTUAL_RUST_SOURCE_BASE_DIR="$(cd download/sysroot/sysroot_src; pwd)" +export CFG_VIRTUAL_RUST_SOURCE_BASE_DIR="$(cd build/stdlib; pwd)" # Allow the testsuite to use llvm tools host_triple=$(rustc -vV | grep host | cut -d: -f2 | tr -d " ") |