1 files changed, 31 insertions, 18 deletions
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 423fa566..5c9ac509 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -88,24 +88,6 @@ if [ "${CARCH}" = "i486" ]; then
       '
   )"
 
-  # disable CET (Control Flow instructions endbr32/enbr64)
-  eval "$(
-    declare -f build | \
-      sed '
-        s/--enable-cet=auto/--disable-cet/
-      '
-  )"
-
-else
-
-  # force enable CET (Control Flow instructions endbr32/enbr64)
-  eval "$(
-    declare -f build | \
-      sed '
-        s/--enable-cet=auto/--enable-cet/
-      '
-  )"
-
 fi
 
 makedepends=(${makedepends[@]//lib32-glibc/})
@@ -128,3 +110,34 @@ if [ "${CARCH}" = "i486" ]; then
       '
   )"
 fi
+
+# testing on 486 VMs takes too long and runs in virtual memory exhaustion
+if [ "${CARCH}" = "i486" ]; then
+  unset check
+fi
+
+# disable CET on all subarchitectures (Control Flow instructions endbr32/enbr64)
+eval "$(
+  declare -f build | \
+    sed '
+      s/--enable-cet=auto/--disable-cet/
+    '
+)"
+
+# remove rust on i486
+makedepends=(${makedepends[@]//rust/})
+makedepends_i686+=('rust')
+makedepends_pentium4+=('rust')
+if [ "${CARCH}" = "i486" ]; then
+  package_gcc-rust() {
+    echo "No Rust on i486."
+  }
+
+  eval "$(
+    declare -f build | \
+      sed '
+        /enable-languages/ s/,rust//
+      '
+  )"
+fi
+