diff --git a/config/functions b/config/functions
index 631ee2cf0a..0fed513143 100644
--- a/config/functions
+++ b/config/functions
@@ -475,7 +475,7 @@ setup_toolchain() {
       export _python_exec_prefix=/
 
       # rust
-      case "${MACHINE_HARDWARE_CPU}" in
+      case "${MACHINE_HARDWARE_NAME}" in
         "arm")
           RUST_HOST="arm-unknown-linux-gnueabihf"
           ;;
@@ -511,13 +511,13 @@ libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config'
 [build_machine]
 system = 'linux'
 cpu_family = '${MACHINE_HARDWARE_NAME}'
-cpu = '${MACHINE_HARDWARE_CPU}'
+cpu = '${MACHINE_HARDWARE_NAME}'
 endian = 'little'
 
 [host_machine]
 system = 'linux'
 cpu_family = '${MACHINE_HARDWARE_NAME}'
-cpu = '${MACHINE_HARDWARE_CPU}'
+cpu = '${MACHINE_HARDWARE_NAME}'
 endian = 'little'
 
 [built-in options]
@@ -549,7 +549,7 @@ libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config'
 [build_machine]
 system = 'linux'
 cpu_family = '${MACHINE_HARDWARE_NAME}'
-cpu = '${MACHINE_HARDWARE_CPU}'
+cpu = '${MACHINE_HARDWARE_NAME}'
 endian = 'little'
 
 [host_machine]
diff --git a/config/optimize b/config/optimize
index 6122fc54a9..fe5f8ec625 100644
--- a/config/optimize
+++ b/config/optimize
@@ -65,9 +65,7 @@ if [ -z "$HOST_LIBDIR" ]; then
   HOST_LIBDIR="$TOOLCHAIN/lib"
 
   # ubuntu/debian specific "multiarch support"
-  export MACHINE_HARDWARE_CPU="$(uname -p)"
   export MACHINE_HARDWARE_NAME="$(uname -m)"
-  export MACHINE_HARDWARE_PLATFORM="$(uname -i)"
   FAMILY_TRIPLET=$($LOCAL_CC -print-multiarch)
   if [ -n "$FAMILY_TRIPLET" ]; then
     if [ -d /lib/$FAMILY_TRIPLET ]; then
diff --git a/packages/rust/cargo-snapshot/package.mk b/packages/rust/cargo-snapshot/package.mk
index b3a0303168..e010bab6e8 100644
--- a/packages/rust/cargo-snapshot/package.mk
+++ b/packages/rust/cargo-snapshot/package.mk
@@ -6,6 +6,6 @@ PKG_VERSION="$(get_pkg_version rust)"
 PKG_SHA256="9461727d754f865ef2a87479d40bbe4c5176f80963b7c50b7797bc8940d7a0a0"
 PKG_LICENSE="MIT"
 PKG_SITE="https://www.rust-lang.org"
-PKG_URL="https://static.rust-lang.org/dist/cargo-${PKG_VERSION}-${MACHINE_HARDWARE_CPU}-unknown-linux-gnu.tar.xz"
+PKG_URL="https://static.rust-lang.org/dist/cargo-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz"
 PKG_LONGDESC="cargo bootstrap package"
 PKG_TOOLCHAIN="manual"
diff --git a/packages/rust/rust-std-snapshot/package.mk b/packages/rust/rust-std-snapshot/package.mk
index e0d80fcdd5..e3d67b03c3 100644
--- a/packages/rust/rust-std-snapshot/package.mk
+++ b/packages/rust/rust-std-snapshot/package.mk
@@ -6,6 +6,6 @@ PKG_VERSION="$(get_pkg_version rust)"
 PKG_SHA256="270b07aa5f2de52255a117e1e587138d77375ce0d09a1d7fead085f29b3977e9"
 PKG_LICENSE="MIT"
 PKG_SITE="https://www.rust-lang.org"
-PKG_URL="https://static.rust-lang.org/dist/rust-std-${PKG_VERSION}-${MACHINE_HARDWARE_CPU}-unknown-linux-gnu.tar.xz"
+PKG_URL="https://static.rust-lang.org/dist/rust-std-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz"
 PKG_LONGDESC="rust std library bootstrap package"
 PKG_TOOLCHAIN="manual"
diff --git a/packages/rust/rustc-snapshot/package.mk b/packages/rust/rustc-snapshot/package.mk
index b166dcb3f3..fdb75cd8a5 100644
--- a/packages/rust/rustc-snapshot/package.mk
+++ b/packages/rust/rustc-snapshot/package.mk
@@ -6,6 +6,6 @@ PKG_VERSION="$(get_pkg_version rust)"
 PKG_SHA256="21c4613f389ed130fbaaf88f1e984319f72b5fc10734569a5ba19e22ebb03abd"
 PKG_LICENSE="MIT"
 PKG_SITE="https://www.rust-lang.org"
-PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-${MACHINE_HARDWARE_CPU}-unknown-linux-gnu.tar.xz"
+PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz"
 PKG_LONGDESC="rustc bootstrap compiler"
 PKG_TOOLCHAIN="manual"