diff options
author | Herbert Valerio Riedel <hvr@gnu.org> | 2018-12-20 00:16:09 +0100 |
---|---|---|
committer | Herbert Valerio Riedel <hvr@gnu.org> | 2018-12-20 00:16:09 +0100 |
commit | 81c86f285283527450de5d68ed24b73faaa75d1b (patch) | |
tree | 91709c8b52134511769fec38d9d06a7a37534f15 | |
parent | 9d9e35574a92773d872efd58a67339a9e054a9f1 (diff) | |
download | haskell-81c86f285283527450de5d68ed24b73faaa75d1b.tar.gz |
Update `Cabal` submodulewip/cabal-submod-update
While at it, also remove some old cruft
-rw-r--r-- | ghc.mk | 3 | ||||
m--------- | libraries/Cabal | 0 | ||||
-rw-r--r-- | utils/ghc-cabal/ghc.mk | 10 |
3 files changed, 5 insertions, 8 deletions
@@ -451,9 +451,6 @@ PACKAGES_STAGE1 += text PACKAGES_STAGE1 += transformers PACKAGES_STAGE1 += mtl PACKAGES_STAGE1 += parsec -# temporary until Cabal switches to parsec mode by default -libraries/Cabal/Cabal_dist-boot_CONFIGURE_OPTS += --flag parsec -libraries/Cabal/Cabal_dist-install_CONFIGURE_OPTS += --flag parsec PACKAGES_STAGE1 += Cabal/Cabal PACKAGES_STAGE1 += ghc-boot-th PACKAGES_STAGE1 += ghc-boot diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 064d9e9082c825f538655db1868108c48240377 +Subproject 889dd2e8cef26c738d0dbd7c045f5103a285c99 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) |