diff --git a/config/functions b/config/functions
index 708aa9593f..d597bdb2dc 100644
--- a/config/functions
+++ b/config/functions
@@ -485,10 +485,16 @@ pkgconfig = '$PKG_CONFIG'
 llvm-config = '$TOOLCHAIN/bin/llvm-config-host'
 libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config'
 
+[build_machine]
+system = 'linux'
+cpu_family = '${MACHINE_HARDWARE_NAME}'
+cpu = '${MACHINE_HARDWARE_CPU}'
+endian = 'little'
+
 [host_machine]
 system = 'linux'
-cpu_family = '$TARGET_ARCH'
-cpu = '$TARGET_SUBARCH'
+cpu_family = '${MACHINE_HARDWARE_NAME}'
+cpu = '${MACHINE_HARDWARE_CPU}'
 endian = 'little'
 
 [built-in options]
@@ -517,6 +523,12 @@ pkgconfig = '$PKG_CONFIG'
 llvm-config = '$TOOLCHAIN/bin/llvm-config-host'
 libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config'
 
+[build_machine]
+system = 'linux'
+cpu_family = '${MACHINE_HARDWARE_NAME}'
+cpu = '${MACHINE_HARDWARE_CPU}'
+endian = 'little'
+
 [host_machine]
 system = 'linux'
 cpu_family = '$TARGET_ARCH'