Skip to content
Snippets Groups Projects
Commit 7485f848 authored by Bodigrim's avatar Bodigrim Committed by Marge Bot
Browse files

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.
parent 9fad49e0
No related branches found
No related tags found
No related merge requests found
Subproject commit 4bfd6a0352ecfd71e1ca756a007ca827b68416d5
Subproject commit e71f6f263aa4d7ce7a145eb5ac417f2f580f2288
......@@ -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]
......
......@@ -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
"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"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment