diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-07-19 16:27:16 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-12-02 09:32:30 -0500 |
| commit | 7be2ad5f217c0bd8e84a5630dab27e4546827f05 (patch) | |
| tree | ed2bac0cf1fe1e6f777a1e80d492f0527cd577d0 | |
| parent | 3a96a0b6db6a32457ae2f91bb711c2481c767656 (diff) | |
| download | haskell-wip/integer-simple-warnings.tar.gz | |
Bump text submodulewip/integer-simple-warnings
Fixes warnings in integer-simple codepath.
| -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
@@ -413,8 +413,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 @@ -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 1127b30e1e0affa08f056e35ad17957b12982ba +Subproject e9df67b5eb7f21570a8b087867063fcfd4422b7 diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index c921f329cb..4baf372867 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) |