From 81c86f285283527450de5d68ed24b73faaa75d1b Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Thu, 20 Dec 2018 00:16:09 +0100 Subject: Update `Cabal` submodule While at it, also remove some old cruft --- ghc.mk | 3 --- libraries/Cabal | 2 +- utils/ghc-cabal/ghc.mk | 10 +++++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ghc.mk b/ghc.mk index e0d5837a26..7292e4ecc0 100644 --- a/ghc.mk +++ b/ghc.mk @@ -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 index 064d9e9082..889dd2e8ce 160000 --- a/libraries/Cabal +++ b/libraries/Cabal @@ -1 +1 @@ -Subproject commit 064d9e9082c825f538655db1868108c48240377e +Subproject commit 889dd2e8cef26c738d0dbd7c045f5103a285c996 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) -- cgit v1.2.1