Fix download for armv7 container on arm64 host

Merge branch 'bootstrap'
2021-09-10 14:59:26 +02:00 · 2021-09-10 13:55:55 +02:00
1 changed files with 9 additions and 1 deletions
--- a/scripts/bootstrap/bootstrap-haskell
+++ b/scripts/bootstrap/bootstrap-haskell
@@ -176,7 +176,15 @@ download_ghcup() {
 					_url=${base_url}/${ghver}/armv7-linux-ghcup-${ghver}
 					;;
 				aarch64|arm64|armv8l)
-					_url=${base_url}/${ghver}/aarch64-linux-ghcup-${ghver}
+					# we could be in a 32bit docker container, in which
+					# case uname doesn't give us what we want
+					if [ "$(getconf LONG_BIT)" = "32" ] ; then
+						_url=${base_url}/${ghver}/armv7-linux-ghcup-${ghver}
+					elif [ "$(getconf LONG_BIT)" = "64" ] ; then
+						_url=${base_url}/${ghver}/aarch64-linux-ghcup-${ghver}
+					else
+						die "Unknown long bit size: $(getconf LONG_BIT)"
+					fi
 					;;
 				*) die "Unknown architecture: ${arch}"
 					;;
Author	SHA1	Message	Date
Julian Ospald	68bbf31a86	Fix download for armv7 container on arm64 host	2021-09-10 14:59:26 +02:00
Julian Ospald	b58f380e75	Merge branch 'bootstrap'	2021-09-10 13:55:55 +02:00