diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-08-04 12:47:39 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-08-05 10:42:46 -0400 |
| commit | 0acb171c0d5482995e2d10b7009b1a130bfef73f (patch) | |
| tree | e1532276b6677ba0c1e5be07845d6f3bbd5c2acd | |
| parent | bb418ea8012600fb24bceb47b7666b69a22d7e33 (diff) | |
| download | haskell-0acb171c0d5482995e2d10b7009b1a130bfef73f.tar.gz | |
Bump text submodule to 1.2.4.0-rc
| -rw-r--r-- | ghc.mk | 10 | ||||
| m--------- | libraries/text | 0 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 4 |
3 files changed, 7 insertions, 7 deletions
@@ -419,8 +419,8 @@ else # CLEANING # Packages that are built by stage0. These packages are dependencies of # 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 +# Note that these must be given in topological order. +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 @@ -447,14 +447,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 1127b30e1e0affa08f056e35ad17957b12982ba +Subproject ebb98f3929360f3abb681dfca4caa8a190f9c5a diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index 9e403758fa..81504233a3 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -23,9 +23,9 @@ CABAL_CONSTRAINT := --constraint="Cabal == $(CABAL_DOTTED_VERSION)" # macros is triggered by `-hide-all-packages`, so we have to explicitly # enumerate all packages we need in scope. ifeq "$(Windows_Host)" "YES" -CABAL_BUILD_DEPS := ghc-prim base array transformers time containers bytestring deepseq process pretty directory Win32 +CABAL_BUILD_DEPS := ghc-prim base array transformers time containers bytestring deepseq process pretty directory Win32 template-haskell else -CABAL_BUILD_DEPS := ghc-prim base array transformers time containers bytestring deepseq process pretty directory unix +CABAL_BUILD_DEPS := ghc-prim base array transformers time containers bytestring deepseq process pretty directory unix template-haskell endif ghc-cabal_DIST_BINARY_NAME = ghc-cabal$(exeext0) |