[Git][ghc/ghc][master] Bump Cabal submodule

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
7485f848 by Bodigrim at 2023-06-20T03:20:57-04:00
Bump Cabal submodule

This requires changing the recomp007 test because now cabal passes
`this-unit-id` to executable components, and that unit-id contains a
hash which includes the ABI of the dependencies. Therefore changing the
dependencies means that -this-unit-id changes and recompilation is
triggered.

The spririt of the test is to test GHC's recompilation logic assuming
that `-this-unit-id` is constant, so we explicitly pass `-ipid` to
`./configure` rather than letting `Cabal` work it out.

- - - - -


4 changed files:

- libraries/Cabal
- testsuite/tests/driver/T4437.hs
- testsuite/tests/driver/recomp007/Makefile
- testsuite/tests/driver/recomp007/recomp007.stdout


Changes:

=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit 4bfd6a0352ecfd71e1ca756a007ca827b68416d5
+Subproject commit e71f6f263aa4d7ce7a145eb5ac417f2f580f2288


=====================================
testsuite/tests/driver/T4437.hs
=====================================
@@ -37,8 +37,7 @@ check title expected got
 -- See Note [Adding a language extension] in compiler/GHC/Driver/Session.hs.
 expectedGhcOnlyExtensions :: [String]
 expectedGhcOnlyExtensions =
-    [ "TypeAbstractions",
-      "ExtendedLiterals"
+    [ "TypeAbstractions"
     ]
 
 expectedCabalOnlyExtensions :: [String]


=====================================
testsuite/tests/driver/recomp007/Makefile
=====================================
@@ -20,11 +20,11 @@ recomp007:
 	./b/dist/build/test/test
 	"$(GHC_PKG)" unregister --package-db=$(LOCAL_PKGCONF) a-1.0
 	$(MAKE) -s --no-print-directory prep.a2
-	cd b && ../Setup configure -v0 --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=../$(LOCAL_PKGCONF)
+	cd b && ../Setup configure -v0 --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=../$(LOCAL_PKGCONF) --ipid b
 	cd b && ../Setup build
 	./b/dist/build/test/test
 
 prep.%:
-	cd $* && ../Setup configure -v0 --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=../$(LOCAL_PKGCONF)
+	cd $* && ../Setup configure -v0 --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=../$(LOCAL_PKGCONF)  --ipid $*
 	cd $* && ../Setup build -v0
 	cd $* && ../Setup register -v0 --inplace


=====================================
testsuite/tests/driver/recomp007/recomp007.stdout
=====================================
@@ -1,6 +1,6 @@
 "1.0"
-Preprocessing executable 'test' for b-1.0..
-Building executable 'test' for b-1.0..
+Preprocessing executable 'test' for b-1.0...
+Building executable 'test' for b-1.0...
 [1 of 2] Compiling B                ( B.hs, dist/build/test/test-tmp/B.o ) [A package changed]
 [3 of 3] Linking dist/build/test/test [Objects changed]
 "2.0"



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7485f848fd4e6a5936a8cb79c62e62e43e5d9a66

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7485f848fd4e6a5936a8cb79c62e62e43e5d9a66
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/20230620/f41729c5/attachment-0001.html>