2 files changed, 32 insertions, 21 deletions
diff --git a/extra/rust/PKGBUILD b/extra/rust/PKGBUILD
index 7c29aeb9..418aa7fb 100644
--- a/extra/rust/PKGBUILD
+++ b/extra/rust/PKGBUILD
@@ -6,7 +6,7 @@
 # see https://github.com/rust-lang/rust/issues/60294
 
 source+=(config.toml.patch)
-sha256sums+=('573b9869d71740aa5c7023670926600f5843d6e12480e3c9895caa37a4bc479c')
+sha256sums+=('a8b42b5f47c0eaebafbb2cd1f39d2f944945cbb55e87d4dc21c7bd5b1b8964d8')
 
 eval "$(
   declare -f prepare | \
@@ -27,9 +27,7 @@ if [ "${CARCH}" != 'pentium4' ]; then
   eval "$(
     declare -f prepare | \
       sed '
-        $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/src/spec/i686_unknown_linux_gnu.rs"
         $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs"
-        $ i sed -i "s/87a043fd55d96d4bf471c7969df0912ccebdb1a5d52d157f4896af52f7af6d41/1c032d897011bc643fdb241251280d12c1b8cfd3ca3a31a8a2a107f8bf7dce13/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json"
       '
   )"
 fi
@@ -40,7 +38,10 @@ fi
 eval "$(
   declare -f build | \
     sed '
-      /mv.*i686-unknown-linux-gnu.*/d
+      /mkdir.*usr\/lib32/d
+      /ln.*x86_64.*/d
+      /ln.*i686-unknown-linux-gnu.*/d
+      /_pick.*dest-i686.*/d
       s/x86_64-unknown-linux-musl/i686-unknown-linux-musl/
     '
 )"
@@ -77,7 +78,7 @@ makedepends=(${makedepends[@]//lib32-gcc-libs/})
 # Enable on demand, if your previous rust is broken use previous version
 # from build-support
 #makedepends=(${makedepends[@]//rust/})
-#makedepends+=('rust-bin')
+#makedepends+=('rust159-bin')
 
-# rust 1.41 is built against llvm11.0, so force that in as a make dependency
-makedepends+=('llvm11-libs')
+# rust 1.56 is built against llvm12.0, so force that in as a make dependency
+#makedepends+=('llvm12-libs')
diff --git a/extra/rust/config.toml.patch b/extra/rust/config.toml.patch
index 3f0bf664..e262d277 100644
--- a/extra/rust/config.toml.patch
+++ b/extra/rust/config.toml.patch
@@ -1,29 +1,39 @@
 diff -rauN a/config.toml b/config.toml
---- a/config.toml	2021-07-01 13:11:44.805605461 +0530
-+++ b/config.toml	2021-07-01 13:14:42.562880610 +0530
-@@ -5,7 +5,7 @@
- link-shared = true
-
+--- a/config.toml	2021-12-09 10:47:47.487749605 +0100
++++ b/config.toml	2021-12-09 11:12:50.904278715 +0100
+@@ -6,11 +6,10 @@
+ 
  [build]
--target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu", "x86_64-unknown-linux-musl"]
-+target = ["i686-unknown-linux-gnu", "i686-unknown-linux-musl"]
+ target = [
+-  "x86_64-unknown-linux-gnu",
+   "i686-unknown-linux-gnu",
+-  "x86_64-unknown-linux-musl",
++  "i686-unknown-linux-musl",
+   "wasm32-unknown-unknown",
+-  "wasm32-wasi",
++  "wasm32-wasi"
+ ]
  cargo = "/usr/bin/cargo"
  rustc = "/usr/bin/rustc"
- rustfmt = "/usr/bin/rustfmt"
-@@ -24,13 +24,13 @@
- # https://github.com/rust-lang/rust/issues/54872
- codegen-units-std = 1
-
+@@ -28,7 +27,7 @@
+ prefix = "/usr"
+ 
+ [rust]
 -debuginfo-level-std = 2
 +debuginfo-level-std = 0
  channel = "stable"
+ description = "Arch Linux $pkgbase $epoch:$pkgver-$pkgrel"
  rpath = false
-
+@@ -45,10 +44,10 @@
+ [dist]
+ compression-formats = ["gz"]
+ 
 -[target.x86_64-unknown-linux-gnu]
 +[target.i686-unknown-linux-gnu]
  llvm-config = "/usr/bin/llvm-config"
-
+ 
 -[target.x86_64-unknown-linux-musl]
 +[target.i686-unknown-linux-musl]
  sanitizers = false
  musl-root = "/usr/lib/musl"
+