Merge branch 'darwin-arch'

2021-12-01 20:39:05 +01:00 · 2021-12-01 20:39:05 +01:00 · 82a22fe993
commit 82a22fe993
parent ff8865c5c3 dbadcf1858
1 changed files with 3 additions and 1 deletions
--- a/scripts/bootstrap/bootstrap-haskell
+++ b/scripts/bootstrap/bootstrap-haskell
@ -240,7 +240,9 @@ download_ghcup() {
 			_url=${base_url}/${ghver}/x86_64-freebsd${freebsd_ver}-ghcup-${ghver}
            ;;
        "Darwin"|"darwin")
-			case "${arch}" in
+            # uname -m and arch seem to behave different under rosetta
+            # https://superuser.com/questions/835514/why-do-uname-p-and-uname-m-and-arch-output-different-architectures
+            case "$(arch)" in
 				x86_64|amd64)
 					_url=${base_url}/${ghver}/x86_64-apple-darwin-ghcup-${ghver}
 					;;