Skip to content

Commit dac55c9

Browse files
committed
Fix 32bit arches
See haskell#7313 (comment)
1 parent 015db2c commit dac55c9

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ build-armv7-linux-deb10:
4040
TARBALL_ARCHIVE_SUFFIX: armv7-linux-deb1
4141
TARBALL_EXT: tar.xz
4242
ADD_CABAL_ARGS: ""
43+
# temp, because 3.6.2.0 is broken
44+
CABAL_INSTALL_VERSION: 3.4.0.0
4345
retry: 2
4446

4547
build-x86_64-linux:
@@ -79,6 +81,8 @@ build-i386-linux-alpine:
7981
TARBALL_ARCHIVE_SUFFIX: i386-linux-alpine
8082
TARBALL_EXT: tar.xz
8183
ADD_CABAL_ARGS: "--enable-split-sections --enable-executable-static"
84+
# temp, because 3.6.2.0 is broken
85+
CABAL_INSTALL_VERSION: 3.4.0.0
8286

8387
build-x86_64-freebsd13:
8488
extends: .build

.gitlab/ci.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=yes
3030

3131
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
3232

33+
# https://github.com/haskell/cabal/issues/7313#issuecomment-811851884
34+
if [ "$(getconf LONG_BIT)" == "32" ] ; then
35+
echo 'constraints: lukko -ofd-locking' >> cabal.project.release.local
36+
fi
37+
3338
args=(
3439
-w "ghc-$GHC_VERSION"
3540
--disable-profiling

0 commit comments

Comments
 (0)