diff --git a/libraries/Cabal b/libraries/Cabal index 4bfd6a0352ecfd71e1ca756a007ca827b68416d5..e71f6f263aa4d7ce7a145eb5ac417f2f580f2288 160000 --- a/libraries/Cabal +++ b/libraries/Cabal @@ -1 +1 @@ -Subproject commit 4bfd6a0352ecfd71e1ca756a007ca827b68416d5 +Subproject commit e71f6f263aa4d7ce7a145eb5ac417f2f580f2288 diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs index 142c348fca2fb54e398995c513ed3fdb90d3d005..3c07aa56790d901441bc135b725b40406474a6db 100644 --- a/testsuite/tests/driver/T4437.hs +++ b/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] diff --git a/testsuite/tests/driver/recomp007/Makefile b/testsuite/tests/driver/recomp007/Makefile index caf746ed844d9a7843ffa03e8e4c08e0abaf8412..e38112e846418bdb6d604296df24441196af6947 100644 --- a/testsuite/tests/driver/recomp007/Makefile +++ b/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 diff --git a/testsuite/tests/driver/recomp007/recomp007.stdout b/testsuite/tests/driver/recomp007/recomp007.stdout index cbb1b0670b6926f5e497361600f0de6012f6fd11..f8d479b0cd9456265f3c1343af24855ac9030cc6 100644 --- a/testsuite/tests/driver/recomp007/recomp007.stdout +++ b/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"