From 39814b090d99bebb87a475f029de51388b7203a6 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 25 Feb 2022 16:06:46 -0500 Subject: Disable text's dependency on simdutf by default Unfortunately we are simply not currently in a good position to robustly ship binary distributions which link against C++ code like simdutf. Fixes #20724. --- ghc.mk | 4 ++++ hadrian/src/Settings/Packages.hs | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/ghc.mk b/ghc.mk index 68496cd83a..7a07b4a5dc 100644 --- a/ghc.mk +++ b/ghc.mk @@ -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. -- cgit v1.2.1