diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-08-21 11:31:14 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-10-06 11:00:27 -0400 |
| commit | a259e6dabc90f052fcfef18c90ed09c30bf5696c (patch) | |
| tree | 1601ae6c9142a433b93381f89eb675f02e2e7b26 | |
| parent | 721dc35dcc92684138e16968c19f77e299187956 (diff) | |
| download | haskell-a259e6dabc90f052fcfef18c90ed09c30bf5696c.tar.gz | |
Bump text submodule to 1.2.4.0+
Fixes #18588 and #17956.
| -rw-r--r-- | ghc.mk | 8 | ||||
| m--------- | libraries/text | 0 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 4 |
3 files changed, 6 insertions, 6 deletions
@@ -414,7 +414,7 @@ else # CLEANING # programs such as GHC and ghc-pkg, that we do not assume the stage0 # compiler already has installed (or up-to-date enough). -PACKAGES_STAGE0 = binary text transformers mtl parsec Cabal/Cabal hpc ghc-boot-th ghc-boot template-haskell ghc-heap ghci +PACKAGES_STAGE0 = binary transformers mtl hpc ghc-boot-th ghc-boot template-haskell text parsec Cabal/Cabal ghc-heap ghci ifeq "$(Windows_Host)" "NO" PACKAGES_STAGE0 += terminfo endif @@ -441,14 +441,14 @@ PACKAGES_STAGE1 += process PACKAGES_STAGE1 += hpc PACKAGES_STAGE1 += pretty PACKAGES_STAGE1 += binary -PACKAGES_STAGE1 += text PACKAGES_STAGE1 += transformers PACKAGES_STAGE1 += mtl -PACKAGES_STAGE1 += parsec -PACKAGES_STAGE1 += Cabal/Cabal PACKAGES_STAGE1 += ghc-boot-th PACKAGES_STAGE1 += ghc-boot PACKAGES_STAGE1 += template-haskell +PACKAGES_STAGE1 += text +PACKAGES_STAGE1 += parsec +PACKAGES_STAGE1 += Cabal/Cabal PACKAGES_STAGE1 += ghc-compact PACKAGES_STAGE1 += ghc-heap diff --git a/libraries/text b/libraries/text -Subproject c6768a2a07e94b8b26d0f0e53517773de1110ce +Subproject e07c14940c25f33fe5b282912d745d3a79dd4ad diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index 90a47ddf98..fbc9bfc663 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -25,7 +25,7 @@ CABAL_CONSTRAINT := --constraint="Cabal == $(CABAL_DOTTED_VERSION)" ifeq "$(Windows_Host)" "YES" CABAL_BUILD_DEPS := ghc-prim base array transformers time containers bytestring deepseq process pretty directory filepath Win32 else -CABAL_BUILD_DEPS := ghc-prim base array transformers time containers bytestring deepseq process pretty directory filepath unix +CABAL_BUILD_DEPS := ghc-prim base array transformers time containers bytestring deepseq process pretty directory filepath unix template-haskell endif ghc-cabal_DIST_BINARY_NAME = ghc-cabal$(exeext0) @@ -75,7 +75,7 @@ $(ghc-cabal_DIST_BINARY): $(CABAL_LEXER_DEP) utils/ghc-cabal/Main.hs $(TOUCH_DEP -ilibraries/filepath \ -ilibraries/hpc \ -ilibraries/mtl \ - -ilibraries/text \ + -ilibraries/text/src \ libraries/text/cbits/cbits.c \ -Ilibraries/text/include \ -ilibraries/parsec/src \ |