f2d43e11302d7f0133c025f7847ac924b6e9303c

Author: shayne-fletcher

CI.hs

@@ -101,7 +101,7 @@ data DaFlavor = DaFlavor
 
 -- Last tested gitlab.haskell.org/ghc/ghc.git at
 current :: String
-current = "70f7741acd9d50a6cc07553aeaae600afe4a72b8" -- 2025-01-27
+current = "07fe6d1daad01030cb7b9e6897492b7bdaec5a90" -- 2025-03-06
 
 ghcFlavorOpt :: GhcFlavor -> String
 ghcFlavorOpt = \case

ghc-lib-gen/src/Ghclibgen.hs

@@ -1452,14 +1452,28 @@ generateGhcLibCabal ghcFlavor customCppOpts = do
       ],
       ["    reexported-modules:"],
       indent2 (Data.List.NonEmpty.toList (withCommas (Data.List.NonEmpty.fromList $ nubSort parserModules))),
-      if ghcSeries ghcFlavor > GHC_9_10 then
-        -- ghc-lib w/ghc-9.10.1 re-exports ghc-lib-parser GHC.Internal modules
-        join [
-               ["    if impl(ghc < 9.12.1)"],
-               ["      reexported-modules:"],
-               indent3 (Data.List.NonEmpty.toList (withCommas (Data.List.NonEmpty.fromList [  "GHC.Internal.ForeignSrcLang", "GHC.Internal.LanguageExtensions", "GHC.Internal.Lexeme", "GHC.Internal.TH.Syntax", "GHC.Internal.TH.Ppr", "GHC.Internal.TH.PprLib", "GHC.Internal.TH.Lib.Map"])))
-             ]
-      else [],
+      if ghcSeries ghcFlavor > GHC_9_12
+        then
+          join [
+                 ["    if impl(ghc < 9.12.1)"],
+                 ["      hs-source-dirs:"],
+                 ["        libraries/ghc-internal/src"],
+                 ["        libraries/ghc-boot-th-internal"],
+                 ["      reexported-modules:"],
+                 indent3 (Data.List.NonEmpty.toList (withCommas (Data.List.NonEmpty.fromList [ "GHC.Internal.ForeignSrcLang", "GHC.Internal.LanguageExtensions", "GHC.Internal.Lexeme", "GHC.Internal.TH.Syntax"])))
+               ]
+        else
+          if ghcSeries ghcFlavor > GHC_9_10
+          then
+            join [
+                   ["    if impl(ghc < 9.12.1)"],
+                   ["      hs-source-dirs:"],
+                   ["        libraries/ghc-internal/src"],
+                   ["        libraries/ghc-boot-th-internal"],
+                   ["      reexported-modules:"],
+                   indent3 (Data.List.NonEmpty.toList (withCommas (Data.List.NonEmpty.fromList [  "GHC.Internal.ForeignSrcLang", "GHC.Internal.LanguageExtensions", "GHC.Internal.Lexeme", "GHC.Internal.TH.Syntax", "GHC.Internal.TH.Ppr", "GHC.Internal.TH.PprLib", "GHC.Internal.TH.Lib.Map"])))
+               ]
+          else [],
       [ "    exposed-modules:",
         "        Paths_ghc_lib"
       ],
@@ -1582,17 +1596,29 @@ generateGhcLibParserCabal ghcFlavor customCppOpts = do
       indent2 [x | ghcSeries ghcFlavor < GHC_9_0, x <- ["Lexer", "Parser"]],
       ["    exposed-modules:"],
       indent2 parserModules,
-      if ghcSeries ghcFlavor > GHC_9_10 then
-        -- ghc-lib-parser with ghc-9.10.1 needs to contain GHC.Internal modules
-        join [
-               ["    if impl(ghc < 9.12.1)"],
-               ["      hs-source-dirs:"],
-               ["        libraries/ghc-internal/src"],
-               ["        libraries/ghc-boot-th-internal"],
-               ["      exposed-modules:"],
-               indent3 [  "GHC.Internal.ForeignSrcLang", "GHC.Internal.LanguageExtensions", "GHC.Internal.Lexeme", "GHC.Internal.TH.Syntax", "GHC.Internal.TH.Ppr", "GHC.Internal.TH.PprLib", "GHC.Internal.TH.Lib.Map"]
-             ]
-      else []
+      if ghcSeries ghcFlavor > GHC_9_12
+        then
+          join [
+                 ["    if impl(ghc < 9.12.1)"],
+                 ["      hs-source-dirs:"],
+                 ["        libraries/ghc-internal/src"],
+                 ["        libraries/ghc-boot-th-internal"],
+                 ["      exposed-modules:"],
+                 indent3 [  "GHC.Internal.ForeignSrcLang", "GHC.Internal.LanguageExtensions", "GHC.Internal.Lexeme", "GHC.Internal.TH.Syntax"]
+               ]
+      else
+        if ghcSeries ghcFlavor > GHC_9_10
+          then
+            join [
+                   ["    if impl(ghc < 9.12.1)"],
+                   ["      hs-source-dirs:"],
+                   ["        libraries/ghc-internal/src"],
+                   ["        libraries/ghc-boot-th-internal"],
+                   ["      exposed-modules:"],
+                   indent3 [  "GHC.Internal.ForeignSrcLang", "GHC.Internal.LanguageExtensions", "GHC.Internal.Lexeme", "GHC.Internal.TH.Syntax", "GHC.Internal.TH.Ppr", "GHC.Internal.TH.PprLib", "GHC.Internal.TH.Lib.Map"]
+                 ]
+         else
+          []
     ]
   putStrLn "# Generating 'ghc-lib-parser.cabal'... Done!"