diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-08-16 12:50:14 -0400 |
|---|---|---|
| committer | GHC GitLab CI <ghc-ci@gitlab-haskell.org> | 2020-08-17 20:09:30 +0000 |
| commit | 8c7e8e1c802791dda0f1d30c7658c995a8349c51 (patch) | |
| tree | 25f3a5db6236ff57052a181c05b1773b67f42872 | |
| parent | 20e19811fd7b929c02a74d9bdd2cd2d7c0604f6b (diff) | |
| download | haskell-8c7e8e1c802791dda0f1d30c7658c995a8349c51.tar.gz | |
Bump Cabal submodule
| m--------- | libraries/Cabal | 0 | ||||
| -rw-r--r-- | utils/check-api-annotations/check-api-annotations.cabal | 2 | ||||
| -rw-r--r-- | utils/check-ppr/check-ppr.cabal | 2 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc-cabal.cabal | 2 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 23 |
5 files changed, 8 insertions, 21 deletions
diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 32dad5c1cf70d65ecb93b0ec214445cf9c9f661 +Subproject 1d886476c443b227bf93eba62781a6cad5012d9 diff --git a/utils/check-api-annotations/check-api-annotations.cabal b/utils/check-api-annotations/check-api-annotations.cabal index f8363de536..8bf0fb6922 100644 --- a/utils/check-api-annotations/check-api-annotations.cabal +++ b/utils/check-api-annotations/check-api-annotations.cabal @@ -24,6 +24,6 @@ Executable check-api-annotations Build-Depends: base >= 4 && < 5, containers, - Cabal >= 3.0 && < 3.4, + Cabal >= 3.0 && < 3.6, directory, ghc diff --git a/utils/check-ppr/check-ppr.cabal b/utils/check-ppr/check-ppr.cabal index 5938667354..059a4d364c 100644 --- a/utils/check-ppr/check-ppr.cabal +++ b/utils/check-ppr/check-ppr.cabal @@ -25,7 +25,7 @@ Executable check-ppr Build-Depends: base >= 4 && < 5, bytestring, containers, - Cabal >= 3.0 && < 3.4, + Cabal >= 3.0 && < 3.6, directory, filepath, ghc diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal index 49ae948c44..e00a812f32 100644 --- a/utils/ghc-cabal/ghc-cabal.cabal +++ b/utils/ghc-cabal/ghc-cabal.cabal @@ -21,6 +21,6 @@ Executable ghc-cabal Build-Depends: base >= 3 && < 5, bytestring >= 0.10 && < 0.11, - Cabal >= 3.0 && < 3.4, + Cabal >= 3.2 && < 3.6, directory >= 1.1 && < 1.4, filepath >= 1.2 && < 1.5 diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index a964e55070..7e4ccb163c 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -37,25 +37,13 @@ ifneq "$(BINDIST)" "YES" $(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/Fields/Lexer.x),) -# Lexer.x exists so we have to call Alex ourselves -CABAL_LEXER_DEP := bootstrapping/Cabal/Distribution/Fields/Lexer.hs - -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/Fields/Lexer.hs -endif - -$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/Distribution/*/*/*.hs) -$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/Distribution/*/*.hs) -$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/Distribution/*.hs) +$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/src/Distribution/*/*/*.hs) +$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/src/Distribution/*/*.hs) +$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/src/Distribution/*.hs) # N.B. Compile with -O0 since this is not a performance-critical executable # and the Cabal takes nearly twice as long to build with -O1. See #16817. -$(ghc-cabal_DIST_BINARY): $(CABAL_LEXER_DEP) utils/ghc-cabal/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. bootstrapping/. +$(ghc-cabal_DIST_BINARY): utils/ghc-cabal/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. bootstrapping/. "$(GHC)" $(SRC_HC_OPTS) \ $(addprefix -optc, $(SRC_CC_OPTS) $(CONF_CC_OPTS_STAGE0)) \ $(addprefix -optl, $(SRC_LD_OPTS) $(CONF_GCC_LINKER_OPTS_STAGE0)) \ @@ -69,8 +57,7 @@ $(ghc-cabal_DIST_BINARY): $(CABAL_LEXER_DEP) utils/ghc-cabal/Main.hs $(TOUCH_DEP -DBOOTSTRAPPING \ -odir bootstrapping \ -hidir bootstrapping \ - $(CABAL_LEXER_DEP) \ - -ilibraries/Cabal/Cabal \ + -ilibraries/Cabal/Cabal/src \ -ilibraries/binary/src \ -ilibraries/filepath \ -ilibraries/hpc \ |