diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-09-23 16:42:17 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-09-30 02:49:03 -0400 |
| commit | 6527fc57b8e099703f5bdb5ec7f1dfd421651972 (patch) | |
| tree | 29c32e130e422a2ed3e7d1e0b1ef9b46414d9c02 | |
| parent | f8f60efc831c6adb5bfee8449b76238ba6d582db (diff) | |
| download | haskell-6527fc57b8e099703f5bdb5ec7f1dfd421651972.tar.gz | |
Bump Cabal, hsc2hs, directory, process submodules
Necessary for recent Win32 bump.
| -rw-r--r-- | compiler/ghc.cabal.in | 2 | ||||
| -rw-r--r-- | ghc/ghc-bin.cabal.in | 2 | ||||
| -rw-r--r-- | hadrian/src/Rules/Generate.hs | 2 | ||||
| m--------- | libraries/Cabal | 0 | ||||
| m--------- | libraries/directory | 0 | ||||
| m--------- | libraries/process | 0 | ||||
| m--------- | utils/hsc2hs | 0 |
7 files changed, 3 insertions, 3 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index a80b9947a4..dbc5be050c 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -76,7 +76,7 @@ Library ghci == @ProjectVersionMunged@ if os(windows) - Build-Depends: Win32 >= 2.3 && < 2.10 + Build-Depends: Win32 >= 2.3 && < 2.11 else if flag(terminfo) Build-Depends: terminfo == 0.4.* diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in index 7897e7c600..f15ad5e1e3 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.10 + Build-Depends: Win32 >= 2.3 && < 2.11 else Build-Depends: unix >= 2.7 && < 2.9 diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs index f429a8a9d2..03e1649cde 100644 --- a/hadrian/src/Rules/Generate.hs +++ b/hadrian/src/Rules/Generate.hs @@ -166,7 +166,7 @@ copyRules = do prefix -/- "ghci-usage.txt" <~ return "driver" prefix -/- "llvm-targets" <~ return "." prefix -/- "llvm-passes" <~ return "." - prefix -/- "template-hsc.h" <~ return (pkgPath hsc2hs) + prefix -/- "template-hsc.h" <~ return (pkgPath hsc2hs -/- "data") prefix -/- "html/**" <~ return "utils/haddock/haddock-api/resources" prefix -/- "latex/**" <~ return "utils/haddock/haddock-api/resources" diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 5139d6e72d391bffa3cf06f08884277799eb0b4 +Subproject 5aea8a4b8463e1ae95272e190a1022764164294 diff --git a/libraries/directory b/libraries/directory -Subproject c16afcda5708ee9944afa7ea6858e5be894fe67 +Subproject b697b3ea77dd4803f2f8f676dd64c8ea5277fcf diff --git a/libraries/process b/libraries/process -Subproject 11afa0bb827d05ed535463235c5f1805e899227 +Subproject 72c6be917064c923e365622032d1f2fa07acb5e diff --git a/utils/hsc2hs b/utils/hsc2hs -Subproject 7accbea001bcac638c4320d3755af2947811490 +Subproject 9cacd5d465d5797e4935d1aa6ae6a71488a0393 |