Skip to content

Commit e79a030

Browse files
committed
Disable simdutf for text globally. C++ is hard to distribute properly, especially on older GHCs.
See #3822.
1 parent 5580ffc commit e79a030

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

.cirrus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ build_task:
1717
ARTIFACT: "x86_64-freebsd"
1818
DISTRO: "na"
1919
RUNNER_OS: "FreeBSD"
20-
ADD_CABAL_ARGS: "--enable-split-sections --constraint='text -simdutf'"
20+
ADD_CABAL_ARGS: "--enable-split-sections"
2121
GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
2222
CABAL_CACHE_NONFATAL: "yes"
2323
matrix:

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
, toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf"
107107
, DISTRO: "CentOS"
108108
, ARTIFACT: "x86_64-linux-centos7"
109-
, ADD_CABAL_ARGS: "--enable-split-sections --constraint='text -simdutf'" # centos7 gcc is too old to build text +simdutf
109+
, ADD_CABAL_ARGS: "--enable-split-sections"
110110
}
111111
]
112112
# TODO: rm

cabal.project

+3
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ write-ghc-environment-files: never
5555
index-state: 2023-10-06T06:12:29Z
5656

5757
constraints:
58+
-- C++ is hard to distribute, especially on older GHCs
59+
-- See https://github.com/haskell/haskell-language-server/issues/3822
60+
text -simdutf,
5861
-- For GHC 9.4, older versions of entropy fail to build on Windows
5962
entropy >= 0.4.1.10,
6063
-- For GHC 9.4

0 commit comments

Comments
 (0)