diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-09-08 11:42:58 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-09-17 19:46:29 -0400 |
| commit | 59862b4af8cf3ccc9e809d0f67fb5e420166a3a6 (patch) | |
| tree | 978c23f515a1796f3d2468f191635d2018af7326 | |
| parent | 12d9742c523ab3b69db9c98e4a113f7ed8bdf754 (diff) | |
| download | haskell-59862b4af8cf3ccc9e809d0f67fb5e420166a3a6.tar.gz | |
Bump Win32 submodule to 2.9.0.0
Also bumps Cabal, directory
(cherry picked from commit 9c6c1ebc9ab2f18d711a8793c7f0ec36e989d687)
| -rw-r--r-- | compiler/ghc.cabal.in | 2 | ||||
| -rw-r--r-- | ghc/ghc-bin.cabal.in | 4 | ||||
| m--------- | libraries/Cabal | 0 | ||||
| m--------- | libraries/directory | 0 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 23 |
5 files changed, 21 insertions, 8 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index 063bcbf6d7..d3a1801870 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -77,7 +77,7 @@ Library ghci == @ProjectVersionMunged@ if os(windows) - Build-Depends: Win32 >= 2.3 && < 2.7 + Build-Depends: Win32 >= 2.3 && < 2.10 else if flag(terminfo) Build-Depends: terminfo == 0.4.* diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in index cc6864b0fa..0394b121e6 100644 --- a/ghc/ghc-bin.cabal.in +++ b/ghc/ghc-bin.cabal.in @@ -45,7 +45,7 @@ Executable ghc ghc == @ProjectVersionMunged@ if os(windows) - Build-Depends: Win32 >= 2.3 && < 2.7 + Build-Depends: Win32 >= 2.3 && < 2.10 else Build-Depends: unix >= 2.7 && < 2.9 @@ -102,4 +102,4 @@ Executable ghc Default-Extensions: NoImplicitPrelude , ScopedTypeVariables - , BangPatterns
\ No newline at end of file + , BangPatterns diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 1d886476c443b227bf93eba62781a6cad5012d9 +Subproject 5139d6e72d391bffa3cf06f08884277799eb0b4 diff --git a/libraries/directory b/libraries/directory -Subproject 3d9ca6edc0703860829ab3210db78bb4c4ff72b +Subproject c16afcda5708ee9944afa7ea6858e5be894fe67 diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index 7e4ccb163c..a964e55070 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -37,13 +37,25 @@ ifneq "$(BINDIST)" "YES" $(ghc-cabal_INPLACE) : $(ghc-cabal_DIST_BINARY) | $$(dir $$@)/. "$(CP)" $< $@ -$(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) +# 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) # 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): utils/ghc-cabal/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. bootstrapping/. +$(ghc-cabal_DIST_BINARY): $(CABAL_LEXER_DEP) 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)) \ @@ -57,7 +69,8 @@ $(ghc-cabal_DIST_BINARY): utils/ghc-cabal/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. b -DBOOTSTRAPPING \ -odir bootstrapping \ -hidir bootstrapping \ - -ilibraries/Cabal/Cabal/src \ + $(CABAL_LEXER_DEP) \ + -ilibraries/Cabal/Cabal \ -ilibraries/binary/src \ -ilibraries/filepath \ -ilibraries/hpc \ |