diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-02-25 16:06:46 -0500 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-03-24 09:23:04 +0000 |
| commit | 39814b090d99bebb87a475f029de51388b7203a6 (patch) | |
| tree | bbdec1a0e3ada13e4574cc1882288323e0510b91 | |
| parent | 37e8b4c83843d1a7283668180fd4f7955b853c3c (diff) | |
| download | haskell-wip/T20724.tar.gz | |
Disable text's dependency on simdutf by defaultwip/T20724
Unfortunately we are simply not currently in a good position to robustly
ship binary distributions which link against C++ code like simdutf.
Fixes #20724.
| -rw-r--r-- | ghc.mk | 4 | ||||
| -rw-r--r-- | hadrian/src/Settings/Packages.hs | 8 |
2 files changed, 12 insertions, 0 deletions
@@ -474,6 +474,10 @@ endif # and executables. This flag disables the latter. libraries/haskeline_CONFIGURE_OPTS += --flags=-examples +# Disable text's dependency on simdutf due to packaging considerations +# described in #20724. +libraries/text_CONFIGURE_OPTS += --flags=-simdutf + libraries/ghc-bignum_CONFIGURE_OPTS += -f $(BIGNUM_BACKEND) ifeq "$(BIGNUM_BACKEND)" "gmp" diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs index 6114661e14..ffedcce1d4 100644 --- a/hadrian/src/Settings/Packages.hs +++ b/hadrian/src/Settings/Packages.hs @@ -154,6 +154,14 @@ packageArgs = do , package haddock ? builder (Cabal Flags) ? arg "in-ghc-tree" + ---------------------------------- text -------------------------------- + , package text ? mconcat + -- Disable SIMDUTF by default due to packaging difficulties + -- described in #20724. + [ builder (Cabal Flags) ? arg "-simdutf" + -- https://github.com/haskell/text/issues/415 + , builder Ghc ? input "**/Data/Text/Encoding.hs" ? arg "-Wno-unused-imports" ] + ------------------------------- haskeline ------------------------------ -- Hadrian doesn't currently support packages containing both libraries -- and executables. This flag disables the latter. |