Merge branch 'main' into issue-575

machawk1 · Oct 4, 2024 · a3e1821 · a3e1821
2 parents 9ba42a7 + 3953b38
commit a3e1821
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/bundledApps/MAKEFILE.sh b/bundledApps/MAKEFILE.sh
@@ -86,7 +86,16 @@ createBinary ()
 {
   echo "Creating binary"
   which pyinstaller
-  pyinstaller -p bundledApps ./bundledApps/WAIL.py --onefile --windowed --clean --target-arch universal2 --icon="./build/icons/wail_blue.icns"
+
+  # Only specify the universal2 flag if an appropriate Python is installed, otherwise use default
+  if file `which python3` | grep 'universal'; then
+    echo "🌌 Building universal binary"
+    archflag=(--target-arch universal2)
+  else
+    echo "🍎 Building native single-architecture binary"
+  fi
+
+  pyinstaller -p bundledApps ./bundledApps/WAIL.py --onefile --windowed --clean "${archflag[@]}" --icon="./build/icons/wail_blue.icns"
   # Replace default version and icon information from pyinstaller 
   cp ./build/Info.plist ./dist/WAIL.app/Contents/Info.plist
   # Copy the bundledApps and support directories to inside WAIL.app/