diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2019-01-07 00:59:23 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@well-typed.com> | 2019-01-14 09:30:40 -0500 |
| commit | cb31b23d39151c9a8b3c80ca11dd299224940f0d (patch) | |
| tree | 0c420ced8f14c3d6bc6ec3731714bc85b5731da3 /utils/ghc-cabal | |
| parent | ce11f6f25c1160262830d9670c4eaaebac37cbaf (diff) | |
| download | haskell-cb31b23d39151c9a8b3c80ca11dd299224940f0d.tar.gz | |
Update `Cabal` submodule
This also requires adapting `ghc-pkg` to use the new Cabal parsing API
as the old ReadP-based one has finally been evicted for good.
Hadrian bit finished by: Ben Gamari <ben@smart-cactus.org>
Diffstat (limited to 'utils/ghc-cabal')
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index 70e418eaf6..9e403758fa 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -37,15 +37,15 @@ $(ghc-cabal_INPLACE) : $(ghc-cabal_DIST_BINARY) | $$(dir $$@)/. "$(CP)" $< $@ # Minor hack, since we can't reuse the `hs-suffix-rules-srcdir` macro -ifneq ($(wildcard libraries/Cabal/Cabal/Distribution/Parsec/Lexer.x),) +ifneq ($(wildcard libraries/Cabal/Cabal/Distribution/Fields/Lexer.x),) # Lexer.x exists so we have to call Alex ourselves -CABAL_LEXER_DEP := bootstrapping/Cabal/Distribution/Parsec/Lexer.hs +CABAL_LEXER_DEP := bootstrapping/Cabal/Distribution/Fields/Lexer.hs -bootstrapping/Cabal/Distribution/Parsec/Lexer.hs: libraries/Cabal/Cabal/Distribution/Parsec/Lexer.x - mkdir -p bootstrapping/Cabal/Distribution/Parsec +bootstrapping/Cabal/Distribution/Fields/Lexer.hs: libraries/Cabal/Cabal/Distribution/Fields/Lexer.x + mkdir -p bootstrapping/Cabal/Distribution/Fields $(call cmd,ALEX) $< -o $@ else -CABAL_LEXER_DEP := libraries/Cabal/Cabal/Distribution/Parsec/Lexer.hs +CABAL_LEXER_DEP := libraries/Cabal/Cabal/Distribution/Fields/Lexer.hs endif $(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/Distribution/*/*/*.hs) |