about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbjorn3 <17426603+bjorn3@users.noreply.github.com>2022-09-01 16:41:01 +0000
committerbjorn3 <17426603+bjorn3@users.noreply.github.com>2022-09-01 16:41:01 +0000
commit244455d8e3137f3bd3e2ee6a49ebb787e7d7f792 (patch)
tree5483109e27a1ac2b0d6d8c99beee510e01c00d39
parentde7342b4446476a2d9375a7f93be54dc9f8707d1 (diff)
downloadrust-244455d8e3137f3bd3e2ee6a49ebb787e7d7f792.tar.gz
rust-244455d8e3137f3bd3e2ee6a49ebb787e7d7f792.zip
Apply sysroot patches to rustc bootstrap and rustc test suite tests
This is necessary on AArch64 as 128bit atomics aren't yet supported by
Cranelift.
-rw-r--r--scripts/setup_rust_fork.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh
index 091bfa1e992..6ae8b14f4c0 100644
--- a/scripts/setup_rust_fork.sh
+++ b/scripts/setup_rust_fork.sh
@@ -10,6 +10,8 @@ git fetch
 git checkout -- .
 git checkout "$(rustc -V | cut -d' ' -f3 | tr -d '(')"
 
+git am ../patches/*-sysroot-*.patch
+
 git apply - <<EOF
 diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml
 index d95b5b7f17f..00b6f0e3635 100644