Skip to content

Commit 535dbb7

Browse files
authored
Merge pull request #8 from mitizhi/master
Fix installation for x86_64 Linux
2 parents a4ac02d + 39ab9fe commit 535dbb7

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

bin/get_haskell_stack

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ do_ubuntu_install() {
141141
if is_64_bit ; then
142142
install_dependencies
143143
print_bindist_notice
144-
install_64bit_static_binary
144+
install_64bit_standard_binary
145145
else
146146
install_dependencies
147147
print_bindist_notice
@@ -167,7 +167,7 @@ do_debian_install() {
167167
elif is_64_bit ; then
168168
install_dependencies
169169
print_bindist_notice
170-
install_64bit_static_binary
170+
install_64bit_standard_binary
171171
else
172172
install_dependencies
173173
print_bindist_notice
@@ -187,7 +187,7 @@ do_fedora_install() {
187187
if is_64_bit ; then
188188
install_dependencies "$1"
189189
print_bindist_notice
190-
install_64bit_static_binary
190+
install_64bit_standard_binary
191191
else
192192
install_dependencies "$1"
193193
print_bindist_notice
@@ -207,7 +207,7 @@ do_centos_install() {
207207
if is_64_bit ; then
208208
install_dependencies
209209
print_bindist_notice
210-
install_64bit_static_binary
210+
install_64bit_standard_binary
211211
else
212212
install_dependencies
213213
case "$1" in
@@ -256,7 +256,7 @@ do_alpine_install() {
256256
}
257257
install_dependencies
258258
if is_64_bit ; then
259-
install_64bit_static_binary
259+
install_64bit_standard_binary
260260
else
261261
die "Sorry, there is currently no 32-bit Alpine Linux binary available."
262262
fi
@@ -272,7 +272,7 @@ do_sloppy_install() {
272272
if is_arm ; then
273273
install_arm_binary
274274
elif is_64_bit ; then
275-
install_64bit_static_binary
275+
install_64bit_standard_binary
276276
else
277277
install_32bit_standard_binary
278278
fi
@@ -467,10 +467,15 @@ install_32bit_standard_binary() {
467467
install_from_bindist "linux-i386"
468468
}
469469

470+
# missing from stackage.org at the moment
470471
install_64bit_static_binary() {
471472
install_from_bindist "linux-x86_64-static"
472473
}
473474

475+
install_64bit_standard_binary() {
476+
install_from_bindist "linux-x86_64"
477+
}
478+
474479
install_32bit_gmp4_linked_binary() {
475480
install_from_bindist "linux-i386-gmp4"
476481
}

0 commit comments

Comments
 (0)