diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-09-09 12:14:16 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-11-18 22:27:20 -0500 |
| commit | 7f7d7888572358a4df43b3db6b3bb0061fccfd10 (patch) | |
| tree | 4ffa24ec12ca7ed0b04e459c67dd0d7ab7232942 /utils/ghc-cabal | |
| parent | 59e8a90093aa5f37f58047718865fd81887ca6ac (diff) | |
| download | haskell-7f7d7888572358a4df43b3db6b3bb0061fccfd10.tar.gz | |
ghc-cabal: Use bootstrap compiler's text package
This avoids the need to build `text` without Cabal, in turn avoiding the
need to reproduce the workaround for #20010 contained therein.
Diffstat (limited to 'utils/ghc-cabal')
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index be79e14670..dfdc2d50c4 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -22,7 +22,7 @@ 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 +CABAL_BUILD_DEPS := ghc-prim base binary array transformers time containers bytestring deepseq process pretty directory filepath template-haskell text ifeq "$(Windows_Host)" "YES" CABAL_BUILD_DEPS += Win32 else @@ -76,14 +76,6 @@ $(ghc-cabal_DIST_BINARY): $(CABAL_LEXER_DEP) utils/ghc-cabal/Main.hs $(TOUCH_DEP -ilibraries/filepath \ -ilibraries/hpc \ -ilibraries/mtl \ - -ilibraries/text/src \ - libraries/text/cbits/is_ascii.c \ - libraries/text/cbits/measure_off.c \ - libraries/text/cbits/reverse.c \ - libraries/text/cbits/utils.c \ - libraries/text/cbits/simdutf.cpp \ - libraries/text/cbits/validate_utf8.cpp \ - -Ilibraries/text/include \ -ilibraries/parsec/src \ $(utils/ghc-cabal_dist_EXTRA_HC_OPTS) \ $(EXTRA_HC_OPTS) |