Skip to content

Commit 3da9393

Browse files
committed
Merge branch 'HallowedDust5-fix-get_isa-logic'
2 parents 7affa07 + 0c0edbd commit 3da9393

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

ChangeLog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ Bug fixes:
5252
[#5608](https://github.com/commercialhaskell/stack/pull/5608)
5353
* On Unix-like operating systems, respect the `with-gcc` option when installing
5454
GHC. See [#5609](https://github.com/commercialhaskell/stack/pull/5609)
55+
* Fixed logic in `get_isa()` in `get-stack.sh` to exclude systems that don't
56+
have x86 in their `uname -m` output. See
57+
[5792](https://github.com/commercialhaskell/stack/issues/5792).
5558

5659
## v2.7.5
5760

etc/scripts/get-stack.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,10 @@ get_isa() {
7575
echo arm
7676
elif uname -m | grep -q aarch64 ; then
7777
echo aarch64
78-
else
78+
elif uname -m | grep -q x86 ; then
7979
echo x86
80+
else
81+
die "$(uname -m) is not a supported instruction set"
8082
fi
8183
}
8284

0 commit comments

Comments
 (0)