Merge pull request #10293 from 9999years/cabal-validate-sh

Support ARM / M1 macOS in `validate.sh`

validate.sh

@@ -299,15 +299,35 @@ JOBS="-j$JOBS"
 # assume compiler is GHC
 RUNHASKELL=$(echo "$HC" | sed -E 's/ghc(-[0-9.]*)$/runghc\1/')
 
-case "$(uname)" in
+ARCH=$(uname -m)
+
+case "$ARCH" in
+    arm64)
+        ARCH=aarch64
+        ;;
+    x86_64)
+        ARCH=x86_64
+        ;;
+    *)
+        echo "Warning: Unknown architecture '$ARCH'"
+        ;;
+esac
+
+OS=$(uname)
+
+case "$OS" in
     MINGW64*)
-        ARCH="x86_64-windows"
+        ARCH="$ARCH-windows"
+        ;;
+    Linux)
+        ARCH="$ARCH-linux"
         ;;
-    Linux   )
-        ARCH="x86_64-linux"
+    Darwin)
+        ARCH="$ARCH-osx"
         ;;
     *)
-        ARCH="x86_64-osx"
+        echo "Warning: Unknown operating system '$OS'"
+        ARCH="$ARCH-$OS"
         ;;
 esac