[Git][ghc/ghc][wip/bump-win32] 2 commits: Bump Cabal, directory, process submodules

[Ben Gamari]

Ben Gamari pushed to branch wip/bump-win32 at Glasgow Haskell Compiler / GHC


Commits:
5c20b328 by Ben Gamari at 2020-09-24T09:42:07-04:00
Bump Cabal, directory, process submodules

Necessary for recent Win32 bump.

- - - - -
102b1728 by Ben Gamari at 2020-09-24T09:42:22-04:00
testsuite: Mark T12971 as broken on Windows

Due to #17945.

- - - - -


6 changed files:

- libraries/Cabal
- libraries/directory
- libraries/process
- testsuite/tests/driver/all.T
- utils/ghc-cabal/ghc.mk
- utils/hsc2hs


Changes:

=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit 5139d6e72d391bffa3cf06f08884277799eb0b45
+Subproject commit e4be83379c1299bd254654a8666744b3668fd96f


=====================================
libraries/directory
=====================================
@@ -1 +1 @@
-Subproject commit c16afcda5708ee9944afa7ea6858e5be894fe67e
+Subproject commit b697b3ea77dd4803f2f8f676dd64c8ea5277fcf0


=====================================
libraries/process
=====================================
@@ -1 +1 @@
-Subproject commit 11afa0bb827d05ed535463235c5f1805e8992273
+Subproject commit 72c6be917064c923e365622032d1f2fa07acb5eb


=====================================
testsuite/tests/driver/all.T
=====================================
@@ -258,7 +258,7 @@ test('T12752pass', normal, compile, ['-DSHOULD_PASS=1 -Wcpp-undef'])
 
 test('T12955', normal, makefile_test, [])
 
-test('T12971', ignore_stdout, makefile_test, [])
+test('T12971', [when(opsys('mingw32'), expect_broken(17945)), ignore_stdout], makefile_test, [])
 test('json', normal, compile_fail, ['-ddump-json'])
 test('json2', normalise_version('base','ghc-prim'), compile, ['-ddump-types -ddump-json'])
 test('T16167', exit_code(1), run_command, 


=====================================
utils/ghc-cabal/ghc.mk
=====================================
@@ -38,20 +38,20 @@ $(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),)
+ifneq ($(wildcard libraries/Cabal/Cabal/src/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
+bootstrapping/Cabal/Distribution/Fields/Lexer.hs: libraries/Cabal/Cabal/src/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
+CABAL_LEXER_DEP := libraries/Cabal/Cabal/src/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.
@@ -70,7 +70,7 @@ $(ghc-cabal_DIST_BINARY): $(CABAL_LEXER_DEP) utils/ghc-cabal/Main.hs $(TOUCH_DEP
 	       -odir  bootstrapping \
 	       -hidir bootstrapping \
 	       $(CABAL_LEXER_DEP) \
-	       -ilibraries/Cabal/Cabal \
+	       -ilibraries/Cabal/Cabal/src \
 	       -ilibraries/binary/src \
 	       -ilibraries/filepath \
 	       -ilibraries/hpc \


=====================================
utils/hsc2hs
=====================================
@@ -1 +1 @@
-Subproject commit 7accbea001bcac638c4320d3755af29478114901
+Subproject commit 4171a459e9d66ebf71d92368be3d7f55cca3e7e1



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8b752ea76212ee92d760516efbf515c2cac41776...102b172828855545732f7b1348fb9660f8a724bd

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8b752ea76212ee92d760516efbf515c2cac41776...102b172828855545732f7b1348fb9660f8a724bd
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200924/2edc5b5f/attachment-0001.html>