add --arch flag (#3349)

.github/workflows/make_bundle.yml

@@ -63,7 +63,7 @@ jobs:
           VER=`python bundle.py --version`
           echo "version=${VER}" >> $GITHUB_ENV
           echo "Version: $VER"
-          ARCH_SUFFIX=`python -c "import platform; print(platform.machine())"`
+          ARCH_SUFFIX=`python bundle.py --arch`
           echo "arch-suffix=${ARCH_SUFFIX}" >> $GITHUB_ENV
           echo "Machine: ${ARCH_SUFFIX}"
       - name: Make Bundle

bundle.py

@@ -207,7 +207,16 @@ def patch_python_lib_location():
 
 
 def patch_environment_variables():
-    os.environ["ARCH"] = ARCH
+    os.environ["ARCH"] = architecture()
+
+
+def architecture():
+    arch = platform.machine() or "generic"
+    # Try to canonicalize across OS
+    replacements = {
+        "amd64": "x86_64",
+    }
+    return replacements.get(arch.lower(), arch)
 
 
 def make_zip():
@@ -283,4 +292,7 @@ def bundle():
     if '--version' in sys.argv:
         print(VERSION)
         sys.exit()
+    if '--arch' in sys.argv:
+        print(architecture())
+        sys.exit()
     print('created', bundle())