diff options
| author | Tamar Christina <tamar@zhox.com> | 2020-06-12 18:33:24 +0100 |
|---|---|---|
| committer | Tamar Christina <tamar@zhox.com> | 2020-06-17 11:03:30 +0100 |
| commit | 23276eaca2b93b6f9f4ae3c6a630f9dafb5d50e0 (patch) | |
| tree | 19970a67a40833df048493a9a65c726c2e35852a | |
| parent | 54083e451c9ff0d8de76e7ec365f4d880f5f9e70 (diff) | |
| download | haskell-23276eaca2b93b6f9f4ae3c6a630f9dafb5d50e0.tar.gz | |
winio: update ghc-cabal to handle new Cabal submodule bump
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index 381bc53a02..a964e55070 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -22,10 +22,11 @@ CABAL_CONSTRAINT := --constraint="Cabal == $(CABAL_DOTTED_VERSION)" # generate MIN_VERSION_<pkgname>() CPP macros. The generation of those # macros is triggered by `-hide-all-packages`, so we have to explicitly # enumerate all packages we need in scope. +CABAL_BUILD_DEPS := ghc-prim base binary array transformers time containers bytestring deepseq process pretty directory filepath template-haskell ifeq "$(Windows_Host)" "YES" -CABAL_BUILD_DEPS := ghc-prim base array transformers time containers bytestring deepseq process pretty directory filepath Win32 template-haskell +CABAL_BUILD_DEPS += Win32 else -CABAL_BUILD_DEPS := ghc-prim base array transformers time containers bytestring deepseq process pretty directory filepath unix template-haskell +CABAL_BUILD_DEPS += unix endif ghc-cabal_DIST_BINARY_NAME = ghc-cabal$(exeext0) @@ -65,7 +66,6 @@ $(ghc-cabal_DIST_BINARY): $(CABAL_LEXER_DEP) utils/ghc-cabal/Main.hs $(TOUCH_DEP -no-user-package-db \ -Wall -fno-warn-unused-imports -fno-warn-warnings-deprecations \ -DCABAL_VERSION=$(CABAL_VERSION) \ - -DCABAL_PARSEC \ -DBOOTSTRAPPING \ -odir bootstrapping \ -hidir bootstrapping \ |