Separate out cpu_method to environment.py and add amd64 quirk

mesonbuild/environment.py

@@ -69,6 +69,13 @@ def detect_cpu_family():
     # Add fixes here as bugs are reported.
     return trial
 
+def detect_cpu():
+    trial = platform.machine().lower()
+    if trial == 'amd64':
+        return 'x86_64'
+    # Add fixes here as bugs are reported.
+    return trial
+
 def detect_system():
     return platform.system().lower()
 

mesonbuild/interpreter.py

@@ -326,7 +326,7 @@ class BuildMachine(InterpreterObject):
         return environment.detect_cpu_family()
 
     def cpu_method(self, args, kwargs):
-        return platform.machine().lower()
+        return environment.detect_cpu()
 
     def system_method(self, args, kwargs):
         return environment.detect_system()